diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 04e546fa66fb5deb702d90b591466ebc2f757f5f..78662bae3e8f675226249b72f756a1a747580f93 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -40,7 +40,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 | INFO | yes -**data.springProfilesActive** | active spring profile | string | gcp | yes **data.entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes **data.registerHost** | register service host address | string | `http://register` | yes **data.partitionHost** | partition service host address | string | `http://partition` | yes diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml index ce5da3ac6d8e108e88c1272bc769ac69242f2267..b1a685a5a45192b8ce3d14fba1ac69614a1dd84d 100644 --- a/devops/gc/deploy/templates/configmap.yaml +++ b/devops/gc/deploy/templates/configmap.yaml @@ -7,7 +7,6 @@ metadata: namespace: {{ .Release.Namespace | quote}} data: LOG_LEVEL: {{ .Values.data.logLevel | quote}} - SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote}} ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote}} REGISTER_HOST: {{ .Values.data.registerHost | quote}} PARTITION_HOST: {{ .Values.data.partitionHost | quote}} @@ -18,5 +17,8 @@ data: {{- else }} REDIS_HOST: {{ printf "redis-%s" .Values.conf.appName | quote }} {{- end }} - {{- if not .Values.global.onPremEnabled }} + {{- if .Values.global.onPremEnabled }} + SPRING_PROFILES_ACTIVE: "anthos" + {{- else }} + SPRING_PROFILES_ACTIVE: "gcp" {{- end }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index e78d466f563fba2c17aa6222c17e667d860e8c98..5cd7cf08a31cbe35d368e054a6786e9cd8f25fba 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -6,7 +6,6 @@ global: data: #Configmaps logLevel: "ERROR" - springProfilesActive: "gcp" entitlementsHost: "http://entitlements" registerHost: "http://register" partitionHost: "http://partition"