Update labels

helm-charts/helm-values/di-reports-processor-prod.yml

 kafkaConfigs: prod-kafka-bootstrap-servers
-deploymentName: di-reports-processor-prod
 inputTopicName: mb-di-reporting-prod
 outputTopicName: mb-di-processed-reporting-prod
 reportingTopicName: none

helm-charts/helm-values/di-reports-processor-stage.yml

 kafkaConfigs: prod-kafka-bootstrap-servers
-deploymentName: di-reports-processor-stage
 inputTopicName: mb-di-reporting-stage
 outputTopicName: mb-di-processed-reporting-stage
 reportingTopicName: none

helm-charts/helm-values/di-reports-processor-test.yml

 kafkaConfigs: test-kafka-bootstrap-servers
-deploymentName: di-reports-processor-test
 inputTopicName: mb-di-reporting-prod
 outputTopicName: mb-di-processed-reporting-prod
 reportingTopicName: none

helm-charts/templates/app-config.yml

@@ -4,7 +4,7 @@ metadata:
   name: "{{ .Values.deploymentName }}-config"
   namespace: memobase
 data:
-  APPLICATION_ID: {{ .Values.deploymentName }}
+  APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
   TOPIC_IN: {{ .Values.inputTopicName }}
   TOPIC_OUT: {{ .Values.outputTopicName }}
   TOPIC_PROCESS: {{ .Values.reportingTopicName }}
\ No newline at end of file

helm-charts/templates/deployment.yaml

@@ -2,27 +2,29 @@ apiVersion: apps/v1
 kind: Deployment
 
 metadata:
-  name: "{{ .Values.deploymentName }}-deployment"
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-deployment"
   namespace: memobase
   labels:
-    app: "{{ .Values.deploymentName }}"
+    app: "{{ .Values.k8sName }}"
     environment: {{ .Values.k8sEnvironment }}
-    group: "documents-import"
+    group: {{ .Values.k8sGroupName }}
 spec:
   selector:
     matchLabels:
-      app: {{ .Values.deploymentName }}
+      app: {{ .Values.k8sName }}
+      environment: {{ .Values.k8sEnvironment }}
+      group: {{ .Values.k8sGroupName }}
   replicas: {{ .Values.k8sReplicas }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.deploymentName }}"
+        app: "{{ .Values.k8sName }}"
         environment: {{ .Values.k8sEnvironment }}
-        group: "documents-import"
+        group: {{ .Values.k8sGroupName }}
     spec:
       restartPolicy: Always
       containers:
-      - name: "{{ .Values.deploymentName }}-container"
+      - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-container"
         image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
         imagePullPolicy: Always
         resources:
@@ -36,4 +38,4 @@ spec:
         - configMapRef:
             name: "{{ .Values.kafkaConfigs }}"
         - configMapRef:
-            name: "{{ .Values.deploymentName }}-config"
\ No newline at end of file
+            name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
\ No newline at end of file

helm-charts/values.yaml

@@ -2,7 +2,11 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/reports-processor"
 tag: "latest"
 
-k8sEnvironment: placeholder
+
+k8sName: "reports-processor"
+k8sGroupId: "di"
+k8sGroupName: "documents-import"
+k8sEnvironment: "placeholder"
 k8sReplicas: 3
 k8sRequestsCpu: "0.1"
 k8sRequestsMemory: "128Mi"
@@ -10,7 +14,6 @@ k8sLimitsCpu: "0.5"
 k8sLimitsMemory: "512Mi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
-deploymentName: placeholder
 inputTopicName: import-process-reporting
 outputTopicName: import-process-processed-reporting
 reportingTopicName: none
\ No newline at end of file