diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 92af47af9afea3e4348f4c0f30622af13ef246ff..595906fadc54aa595bd84905938d359fbb67a53d 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.googleCloudProject** | your Google Cloud cloud project | string | -| yes **data.entitlementsHost** | Entitlements host | string | "http://entitlements" | yes **data.partitionHost** | Partition host | string | "http://partition" | yes diff --git a/devops/gc/deploy/templates/register-variables.yml b/devops/gc/deploy/templates/register-variables.yml index cce7a7163122449d43fc368d42bf1041ed147b20..f2d53f091d9180a38fe47b865fe63d6fd8cfbba5 100644 --- a/devops/gc/deploy/templates/register-variables.yml +++ b/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" diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index 09ea7878bbc62ca4d6edbf385f92e98b0fc56118..23d81ee8d855635a60d80218f639797170e7ee22 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -10,7 +10,6 @@ global: data: #Configmap logLevel: "ERROR" - springProfilesActive: "gcp" googleCloudProject: "" entitlementsHost: "http://entitlements" partitionHost: "http://partition"