diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 37f32b3432db4d8959dac2ae7787ad693326c6c5..8740728054adc2dccc2ad294b6a9452afe3a0021 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -99,18 +99,11 @@ First you need to set variables in **values.yaml** file using any code editor. S **logLevel** | logging level | string | ERROR | yes **springProfilesActive** | active spring profile | string | gcp | yes **acceptHttp** | accept Http traffic | string | true | yes -**googleAudiences** | your Google Cloud client id | string | - | yes **dataPartitionId** | data partition id | string | - | yes **entitlementsHost** | Entitlements host URL | string | <http://entitlements> | yes **defaultLegalTag** | Default legal tag | string | default-data-tag| yes **legalHost** | Legal host URL | string | <http://legal> | yes -> googleAudiences: If you are connected to Google Cloud console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command: - -```console -cat ~/.config/gcloud/application_default_credentials.json | grep client_id -``` - ### Deployment variables | Name | Description | Type | Default |Required | diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml index 69d88aabc9255c4980d1f0f70cc2fa18b9f27c6a..da2680a45ae9b21f48afea358eb651e0297e83d2 100644 --- a/devops/gc/deploy/templates/configmap-bootstrap.yaml +++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml @@ -12,7 +12,4 @@ data: LEGAL_HOST: {{ .Values.data.legalHost | quote }} DEFAULT_LEGAL_TAG: {{ .Values.data.defaultLegalTag | quote }} ONPREM_ENABLED: {{ .Values.conf.onPremEnabled | quote }} - {{- if not .Values.conf.onPremEnabled }} - GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }} - {{- end }} {{- end }} diff --git a/devops/gc/deploy/templates/legal-configmap.yaml b/devops/gc/deploy/templates/legal-configmap.yaml index 5c27439a6f9bedba5c4d81d018a0a25bf13ecc67..63eed68ca0d92186e8cb6145b3155471220082c0 100644 --- a/devops/gc/deploy/templates/legal-configmap.yaml +++ b/devops/gc/deploy/templates/legal-configmap.yaml @@ -9,6 +9,3 @@ data: ACCEPT_HTTP: {{ .Values.data.acceptHttp | quote }} LOG_LEVEL: {{ .Values.data.logLevel | quote }} SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }} - {{- if not .Values.conf.onPremEnabled }} - GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }} - {{- end }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index bfe48ff56159496bfd181b82e302d2ad85472b2b..0c5ed8fb606fee58a06fe79bfcad1946e38fb451 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -7,7 +7,6 @@ data: logLevel: "ERROR" springProfilesActive: "gcp" acceptHttp: "true" - googleAudiences: "" dataPartitionId: "" entitlementsHost: "http://entitlements" defaultLegalTag: "default-data-tag"