commit 5a47eaff250a8b4b5035586447ca1284ba620695
author Renu Kumari <renu.kumari@bell.ca> Mon Apr 12 08:36:27 2021 -0400
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Thu Apr 29 17:18:42 2021 +0000
tree b3ea03f0f0b205afa39aa37c4f5e82cc97c9fed7
parent ad0f69e402aaff1e19a5330f3949d3f445b949b5

[CPS] Remove duplicate configuration

1. Introduced spring profiles to override default properties value
2. Added config.additional to provide an ability to add properties
   without changing chart

Issue-ID: CPS-320
Signed-off-by: Renu Kumari <renu.kumari@bell.ca>
Change-Id: If621ad7c5f69f3398a8eae54d5fa6c563cfcba22

kubernetes/cps/templates/deployment.yaml

diff --git a/kubernetes/cps/templates/deployment.yaml b/kubernetes/cps/templates/deployment.yaml
index 861782a..61877c3 100755
--- a/kubernetes/cps/templates/deployment.yaml
+++ b/kubernetes/cps/templates/deployment.yaml
@@ -74,6 +74,9 @@
             path: {{ .Values.readiness.path }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+        env:
+          - name: SPRING_PROFILES_ACTIVE
+            value: {{ .Values.config.spring.profile }}
         resources: {{ include "common.resources" . | nindent 10 }}
         {{- if .Values.nodeSelector }}
         nodeSelector: {{ toYaml .Values.nodeSelector | nindent 12 }}
@@ -82,8 +85,8 @@
         affinity: {{ toYaml .Values.affinity | nindent 12 }}
         {{- end }}
         volumeMounts:
-          - mountPath: /app/resources/application.yml
-            subPath: application.yml
+          - mountPath: /app/resources/application-helm.yml
+            subPath: application-helm.yml
             name: init-data
           - mountPath: /app/resources/logback.xml
             subPath: logback.xml