Update labels

Simplify chart

helm-charts/helm-values/gi-reports-consumer-prod.yml

-deploymentName: gi-reports-consumer-prod
 kafkaConfigs: prod-kafka-bootstrap-servers
 inputTopic: mb-di-processed-reporting-prod
 reportingTopic: mb-di-reports-reporting-prod

helm-charts/helm-values/gi-reports-consumer-stage.yml

-deploymentName: gi-reports-consumer-stage
 kafkaConfigs: stage-kafka-bootstrap-servers
 inputTopic: mb-di-processed-reporting-stage
 reportingTopic: mb-di-reports-reporting-stage

helm-charts/helm-values/gi-reports-consumer-test.yml

-deploymentName: gi-reports-consumer-test
 kafkaConfigs: test-kafka-bootstrap-servers
 inputTopic: mb-di-processed-reporting-prod
 reportingTopic: mb-di-reports-reporting-prod

helm-charts/templates/app-config.yml

 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.deploymentName }}-app-config"
-  namespace: memobase
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
+  namespace: "{{ .Values.k8sNamespace }}"
+  labels:
+    app: "{{ .Values.k8sName }}"
+    environment: "{{ .Values.k8sEnvironment }}"
+    group: "{{ .Values.k8sGroupName }}"
 data:
   API_ENDPOINT_URL: "https://{{ .Values.importApiName }}-{{ .Values.k8sEnvironment}}-service:{{ .Values.importApiPort}}{{ .Values.importApiPath }}"
   STEP_WHITE_LIST_FILE_PATH: "{{ .Values.whitelistFilePath }}"
   ENVIRONMENT: "{{.Values.k8sEnvironment }}"
-  APPLICATION_ID: "{{ .Values.deploymentName }}-{{ .Values.k8sEnvironment }}-app"
+  APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
   TOPIC_IN: "{{ .Values.inputTopic }}"
   TOPIC_OUT: "not-used"
   TOPIC_PROCESS: "{{ .Values.reportingTopic }}"
\ No newline at end of file

helm-charts/templates/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{ .Values.deploymentName }}-deployment"
-  namespace: memobase
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
+  namespace: "{{ .Values.k8sNamespace }}"
   labels:
-    app: "{{ .Values.deploymentName }}"
-    environment: {{ .Values.k8sEnvironment }}
-    group: "documents-import"
+    app: "{{ .Values.k8sName }}"
+    environment: "{{ .Values.k8sEnvironment }}"
+    group: "{{ .Values.k8sGroupName }}"
 spec:
   selector:
     matchLabels:
-      app: "{{ .Values.deploymentName }}"
-  replicas: 1
+      app: "{{ .Values.k8sName }}"
+      environment: "{{ .Values.k8sEnvironment }}"
+      group: "{{ .Values.k8sGroupName }}"
+  replicas: {{ .Values.k8sReplicas }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.deploymentName }}"
-        environment: {{ .Values.k8sEnvironment }}
-        group: "documents-import"
+        app: "{{ .Values.k8sName }}"
+        environment: "{{ .Values.k8sEnvironment }}"
+        group: "{{ .Values.k8sGroupName }}"
+        logging: "{{ .Values.k8sLogging }}"
     spec:
       containers:
-        - name: "{{ .Values.deploymentName }}-container"
+        - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-container"
           image: "{{.Values.registry}}/{{ .Values.image }}:{{ .Values.tag }}"
           imagePullPolicy: Always
           resources:
@@ -34,7 +37,7 @@ spec:
           - configMapRef:
               name: "{{ .Values.kafkaConfigs }}"
           - configMapRef:
-              name: "{{ .Values.deploymentName}}-app-config"
+              name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
           volumeMounts:
             - name: {{ .Values.whitelistFileConfig }}
               mountPath: "/configs"

helm-charts/values.yaml

@@ -3,14 +3,18 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/group-reports-consumer"
 tag: "latest"
 
+k8sName: reports-aggregator
+k8sNamespace: memobase
+k8sGroupId: gi
+k8sGroupName: group-import
 k8sEnvironment: placeholder
+k8sLogging: java
 k8sReplicas: 1
 k8sRequestsCpu: "0.1"
 k8sRequestsMemory: "128Mi"
 k8sLimitsCpu: "0.5"
 k8sLimitsMemory: "512Mi"
 
-deploymentName: placeholder
 kafkaConfigs: placeholder
 inputTopic: placeholder
 reportingTopic: placeholder