From a8cb51a09fefa1d1ffce61e854305f38fa6184ac Mon Sep 17 00:00:00 2001
From: "Mykola Ronik [EPAM / GCP]" <mykola_ronik@epam.com>
Date: Wed, 20 Mar 2024 12:33:54 +0000
Subject: [PATCH] [GONRG-9422]: Remove springProfilesActive explicit setting
---
devops/gc/deploy/README.md | 1 -
devops/gc/deploy/templates/legal-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 35bbe510e..c68b04bc5 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -105,7 +105,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.acceptHttp** | accept Http traffic | string | true | yes
**data.entitlementsHost** | Entitlements host URL | string | <http://entitlements> | yes
**data.defaultLegalTag** | Default legal tag | string | default-data-tag| yes
diff --git a/devops/gc/deploy/templates/legal-configmap.yaml b/devops/gc/deploy/templates/legal-configmap.yaml
index 63eed68ca..fe9c44a70 100644
--- a/devops/gc/deploy/templates/legal-configmap.yaml
+++ b/devops/gc/deploy/templates/legal-configmap.yaml
@@ -8,4 +8,8 @@ metadata:
data:
ACCEPT_HTTP: {{ .Values.data.acceptHttp | quote }}
LOG_LEVEL: {{ .Values.data.logLevel | quote }}
- SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
+ {{- 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 1665d3c31..013342ecb 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -10,7 +10,6 @@ global:
data:
# configmaps
logLevel: "ERROR"
- springProfilesActive: "gcp"
acceptHttp: "true"
entitlementsHost: "http://entitlements"
defaultLegalTag: "default-data-tag"
--
GitLab