diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index a7400605a7970965b69b4fdf3353829f64004ff0..bc39a3fae1dce28bf1e177a3ebb15a47d3bd745a 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -39,7 +39,6 @@ First you need to set variables in **values.yaml** file using any code editor. S | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| **data.logLevel** | logging level | string | `ERROR` | yes -**data.springProfilesActive** | active spring profile | string | `gcp` | yes **data.defaultDataCountry** | Data storage region | string | `US` | yes **data.storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes **data.entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml index 975e5632bcaf04cc938c9820405e8cb1fd573ac8..d71bcc7fb229adb77419c54ec98bf1efd7fbae0d 100644 --- a/devops/gc/deploy/templates/configmap.yaml +++ b/devops/gc/deploy/templates/configmap.yaml @@ -13,7 +13,11 @@ data: LOG_LEVEL: {{ .Values.data.logLevel | quote }} PARTITION_HOST: {{ .Values.data.partitionHost | quote }} STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }} - SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }} + {{- if .Values.global.onPremEnabled }} + SPRING_PROFILES_ACTIVE: "anthos" + {{- else }} + SPRING_PROFILES_ACTIVE: "gcp" + {{- end }} OPA_ENABLED: {{ .Values.data.opaEnabled | quote }} OPA_ENDPOINT: {{ .Values.data.opaEndpoint | quote }} {{- if .Values.data.redisStorageHost }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index 5b9f3849f85d7fa3390959f259ed452d601e7720..92f1a39e73951573aa19dd88ed1bc814195cee38 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -10,7 +10,6 @@ global: data: # configmaps logLevel: "ERROR" - springProfilesActive: "gcp" defaultDataCountry: "US" storageServiceAccountEmail: "storage@service.local" entitlementsHost: "http://entitlements"