[GONRG-9422]: Remove springProfilesActive explicit setting

devops/core-plus/deploy/README.md

@@ -109,7 +109,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **data.partitionNamespace** | datastore namespace where partition will store the data | string | partition | yes
 **data.dataPartitionId** | data partition id | string | - | yes
 **data.datafierSa** | datafier service account | string | datafier | yes
-**data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _springProfilesActive_ is set to "_anthos_"
+**data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _onPremEnabled_ is set to "_true_"
 **data.minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and MINIO_EXTERNAL_ENDPOINT in bootstrap configmap | string | - | no
 **data.minioIgnoreCertCheck** | whether minio should ignore TLS certs validity check, set to true if external minio is protected by self-signed certificates | string | false | no
 **data.indexerAugmenterEnabled** | enable indexer Augmenter | string | false | no

devops/gc/deploy/README.md

@@ -107,13 +107,12 @@ 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.projectId** | your Google Cloud project id | string | - | only in case of Google Cloud installation
 **data.dataProjectId** | in case of multiproject cloud installation (services and data stored in different project) the name of data project | string | - | only in case of multiproject installation
 **data.partitionHost** | partition host | string | partition | yes
 **data.partitionNamespace** | datastore namespace where partition will store the data | string | partition | yes
 **data.datafierSa** | datafier service account | string | datafier | yes
-**data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _springProfilesActive_ is set to "_anthos_"
+**data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _onPremEnabled_ is set to "_true_"
 **data.minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and MINIO_EXTERNAL_ENDPOINT in bootstrap configmap | string | - | no
 **data.minioIgnoreCertCheck** | whether minio should ignore TLS certs validity check, set to true if external minio is protected by self-signed certificates | string | false | no
 **data.indexerAugmenterEnabled** | enable indexer Augmenter | string | false | no

devops/gc/deploy/templates/configmap-bootstrap.yaml

@@ -7,11 +7,11 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
-  ENVIRONMENT: {{ .Values.data.springProfilesActive | quote }}
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
   PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
   DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
   {{- if .Values.global.onPremEnabled }}
+  ENVIRONMENT: "anthos"
   SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }}
   DOMAIN: "{{ .Values.global.domain }}"
   BUCKET_PREFIX: {{ .Values.data.bucketPrefix | quote }}
@@ -24,6 +24,7 @@ data:
   {{- end }}
   MINIO_IGNORE_CERT_CHECK: {{ .Values.data.minioIgnoreCertCheck | quote }}
   {{- else }}
+  ENVIRONMENT: "gcp"
   {{- if .Values.data.dataProjectId }}
   PROJECT_ID: "{{ .Values.data.dataProjectId }}"
   {{- else }}

devops/gc/deploy/templates/configmap.yaml

@@ -7,9 +7,11 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
 data:
   LOG_LEVEL: {{ .Values.data.logLevel | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
   {{- if not .Values.global.onPremEnabled }}
   GOOGLE_CLOUD_PROJECT: {{ .Values.data.projectId | quote }}
   PARTITION_NAMESPACE: {{ .Values.data.partitionNamespace | quote }}
-  SYSTEM_PARTITION_ID: "system" 
+  SYSTEM_PARTITION_ID: "system"
+  SPRING_PROFILES_ACTIVE: "gcp"
+  {{- else }}
+  SPRING_PROFILES_ACTIVE: "anthos"
   {{- end }}

devops/gc/deploy/values.yaml

@@ -8,7 +8,6 @@ global:
 data:
   # configmaps
   logLevel: "ERROR"
-  springProfilesActive: "gcp"
   projectId: ""
   dataProjectId: ""
   partitionHost: "partition"