From 315729f35ecfcea1ca0cae7b2abae70d0f1ecf19 Mon Sep 17 00:00:00 2001
From: "Mykola Ronik [EPAM / GCP]" <mykola_ronik@epam.com>
Date: Wed, 20 Mar 2024 12:38:48 +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, 4 insertions(+), 4 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 04e546fa6..78662bae3 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.entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
**data.registerHost** | register service host address | string | `http://register` | yes
**data.partitionHost** | partition service host address | string | `http://partition` | yes
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index ce5da3ac6..b1a685a5a 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -7,7 +7,6 @@ metadata:
namespace: {{ .Release.Namespace | quote}}
data:
LOG_LEVEL: {{ .Values.data.logLevel | quote}}
- SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote}}
ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote}}
REGISTER_HOST: {{ .Values.data.registerHost | quote}}
PARTITION_HOST: {{ .Values.data.partitionHost | quote}}
@@ -18,5 +17,8 @@ data:
{{- else }}
REDIS_HOST: {{ printf "redis-%s" .Values.conf.appName | quote }}
{{- end }}
- {{- if not .Values.global.onPremEnabled }}
+ {{- 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 e78d466f5..5cd7cf08a 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -6,7 +6,6 @@ global:
data:
#Configmaps
logLevel: "ERROR"
- springProfilesActive: "gcp"
entitlementsHost: "http://entitlements"
registerHost: "http://register"
partitionHost: "http://partition"
--
GitLab