Merge branch 'GONRG-9422_Remove_springProfilesActive' into 'master'

[GONRG-9422]: Remove springProfilesActive explicit setting

See merge request !451

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.googleCloudProject** | your Google Cloud cloud project | string | -| yes
 **data.entitlementsHost** | Entitlements host | string | "http://entitlements" | yes
 **data.partitionHost** | Partition host | string | "http://partition" | yes

devops/gc/deploy/templates/register-variables.yml

@@ -7,7 +7,6 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
 data:
   LOG_LEVEL: {{ .Values.data.logLevel | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
   SUBSCRIBER_PRIVATE_KEY_ID: {{ .Values.data.subscriberPrivateKeyId | quote }}
   {{- if not .Values.global.onPremEnabled }}
   GOOGLE_CLOUD_PROJECT: {{ .Values.data.googleCloudProject  | quote }}
@@ -18,6 +17,9 @@ data:
   SERVICE_IDENTITY: {{ .Values.data.serviceIdentity  | quote }}
   KEY_RING: {{ .Values.data.keyRing  | quote}}
   KMS_KEY: {{ .Values.data.kmsKey  | quote }}
+  SPRING_PROFILES_ACTIVE: "gcp"
+  {{- else }}
+  SPRING_PROFILES_ACTIVE: "anthos"
   {{- end }}
   {{- if .Values.conf.intTestEndpoint }}
   TEST_ENDPOINT: "true"

devops/gc/deploy/values.yaml

@@ -10,7 +10,6 @@ global:
 data:
   #Configmap
   logLevel: "ERROR"
-  springProfilesActive: "gcp"
   googleCloudProject: ""
   entitlementsHost: "http://entitlements"
   partitionHost: "http://partition"