Refactor(deployment): make environment variables explicit for cps container

 - Replaced dynamic env loop with explicit environment variable definitions
  (DB_HOST, DB_USERNAME, DB_PASSWORD, DMI_USERNAME, DMI_PASSWORD, KAFKA_BOOTSTRAP_SERVER).
 - Made dmi stub env. variable from string to integer for ms

Issue-ID: CPS-2973
Change-Id: Icc2962f03fe078ac85d5097f8e5d56620c79800b
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>

diff --git a/cps-charts/templates/cps-deployment.yaml b/cps-charts/templates/cps-deployment.yaml
index 4fe8677..256a535 100644 (file)
--- a/cps-charts/templates/cps-deployment.yaml
+++ b/cps-charts/templates/cps-deployment.yaml
@@ -25,36 +25,10 @@ spec:
             - containerPort: 8080
             - containerPort: 5701
           env:
-            - name: DB_HOST
-              value: "{{ .Values.cps.env.DB_HOST }}"
-            - name: DB_USERNAME
-              value: "{{ .Values.cps.env.DB_USERNAME }}"
-            - name: DB_PASSWORD
-              value: "{{ .Values.cps.env.DB_PASSWORD }}"
-            - name: DMI_USERNAME
-              value: "{{ .Values.cps.env.DMI_USERNAME }}"
-            - name: DMI_PASSWORD
-              value: "{{ .Values.cps.env.DMI_PASSWORD }}"
-            - name: KAFKA_BOOTSTRAP_SERVER
-              value: "{{ .Values.cps.env.KAFKA_BOOTSTRAP_SERVER }}"
-            - name: notification.enabled
-              value: "{{ .Values.cps.env.notification_enabled }}"
-            - name: ONAP_TRACING_ENABLED
-              value: "{{ .Values.cps.env.ONAP_TRACING_ENABLED }}"
-            - name: ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT
-              value: "{{ .Values.cps.env.ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT }}"
-            - name: ONAP_OTEL_EXPORTER_ENDPOINT
-              value: "{{ .Values.cps.env.ONAP_OTEL_EXPORTER_ENDPOINT }}"
-            - name: POLICY_SERVICE_ENABLED
-              value: "{{ .Values.cps.env.POLICY_SERVICE_ENABLED }}"
-            - name: POLICY_SERVICE_DEFAULT_DECISION
-              value: "{{ .Values.cps.env.POLICY_SERVICE_DEFAULT_DECISION }}"
-            - name: CPS_MONITORING_MICROMETER_JVM_EXTRAS
-              value: "{{ .Values.cps.env.CPS_MONITORING_MICROMETER_JVM_EXTRAS }}"
-            - name: JAVA_TOOL_OPTIONS
-              value: "{{ .Values.cps.env.JAVA_TOOL_OPTIONS }}"
-            - name: HAZELCAST_MODE_KUBERNETES_ENABLED
-              value: "{{ .Values.cps.env.HAZELCAST_MODE_KUBERNETES_ENABLED }}"
+            {{- range $envName, $envValue := .Values.cps.env }}
+            - name: {{ $envName | upper }}
+              value: "{{ $envValue }}"
+            {{- end }}
             - name: CPS_NCMP_SERVICE_NAME
               value: {{ include "cps-and-ncmp.name" . }}-cps-hazelcast
           resources:

diff --git a/cps-charts/values.yaml b/cps-charts/values.yaml
index bbe8ee3..ea8b59f 100644 (file)
--- a/cps-charts/values.yaml
+++ b/cps-charts/values.yaml
@@ -125,11 +125,11 @@ dmiStub:
     KAFKA_BOOTSTRAP_SERVER: "cps-and-ncmp-kafka:29092"
     NCMP_CONSUMER_GROUP_ID: "ncmp-group"
     NCMP_ASYNC_M2M_TOPIC: "ncmp-async-m2m"
-    MODULE_INITIAL_PROCESSING_DELAY_MS: "180000"
-    MODULE_REFERENCES_DELAY_MS: "100"
-    MODULE_RESOURCES_DELAY_MS: "1000"
-    READ_DATA_FOR_CM_HANDLE_DELAY_MS: "300"
-    WRITE_DATA_FOR_CM_HANDLE_DELAY_MS: "670"
+    MODULE_INITIAL_PROCESSING_DELAY_MS: 180000
+    MODULE_REFERENCES_DELAY_MS: 100
+    MODULE_RESOURCES_DELAY_MS: 1000
+    READ_DATA_FOR_CM_HANDLE_DELAY_MS: 300
+    WRITE_DATA_FOR_CM_HANDLE_DELAY_MS: 670
   resources:
     limits:
       cpu: "500m"