From 1c30f0bf89306842744c2930904e2ba18cf80038 Mon Sep 17 00:00:00 2001
From: "Mykola Ronik [EPAM / GCP]" <mykola_ronik@epam.com>
Date: Wed, 20 Mar 2024 12:42:30 +0000
Subject: [PATCH] [GONRG-9422]: Remove springProfilesActive explicit setting
---
devops/gc/deploy/README.md | 1 -
devops/gc/deploy/templates/configmap.yaml | 6 +++++-
devops/gc/deploy/values.yaml | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index a7400605a..bc39a3fae 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 975e5632b..d71bcc7fb 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 5b9f3849f..92f1a39e7 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"
--
GitLab