Add logging label

Update labels

helm-charts/helm-values/di-media-metadata-preprocessor-prod.yaml

 k8sEnvironment: prod
-k8sReplicas: 1
-k8sRequestsCpu: "0.2"
-k8sRequestsMemory: "128Mi"
-k8sLimitsCpu: "0.5"
-k8sLimitsMemory: "300Mi"
-
-applicationId: di-media-metadata-preprocessor-prod
 
 bootstrapServers: prod-kafka-bootstrap-servers
 

helm-charts/helm-values/di-media-metadata-preprocessor-stage.yaml

 k8sEnvironment: stage
-k8sReplicas: 1
-k8sRequestsCpu: "0.2"
-k8sRequestsMemory: "128Mi"
-k8sLimitsCpu: "0.5"
-k8sLimitsMemory: "300Mi"
-
-applicationId: di-media-metadata-preprocessor-stage
 
 bootstrapServers: prod-kafka-bootstrap-servers
 

helm-charts/helm-values/di-media-metadata-preprocessor-test.yaml

 k8sEnvironment: test
-k8sReplicas: 1
-k8sRequestsCpu: "0.2"
-k8sRequestsMemory: "128Mi"
-k8sLimitsCpu: "0.5"
-k8sLimitsMemory: "300Mi"
-
-applicationId: di-media-metadata-preprocessor-test
 
 bootstrapServers: test-kafka-bootstrap-servers
 

helm-charts/templates/app-config.yml

@@ -3,8 +3,12 @@ kind: ConfigMap
 metadata:
   name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config"
   namespace: "{{ .Values.k8sNamespace }}"
+  labels:
+    app: "{{ .Values.k8sName }}"
+    group: "{{ .Values.k8sGroupName }}"
+    environment: "{{ .Values.k8sEnvironment }}"
 data:
-  APPLICATION_ID: "{{ .Values.applicationId }}"
+  APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
   TOPIC_IN: "{{ .Values.inputTopicName }}"
   TOPIC_OUT_AV: "{{ .Values.outputTopicAVName }}"
   TOPIC_OUT_IMAGE: "{{ .Values.outputTopicImageName }}"

helm-charts/templates/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
   namespace: "{{ .Values.k8sNamespace }}"
   labels:
-    app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
+    app: "{{ .Values.k8sName }}"
+    group: "{{ .Values.k8sGroupName }}"
+    environment: "{{ .Values.k8sEnvironment }}"
 spec:
   selector:
     matchLabels:
-      app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
-  replicas: {{ .Values.k8sReplicas}}
+      app: "{{ .Values.k8sName }}"
+      group: "{{ .Values.k8sGroupName }}"
+      environment: "{{ .Values.k8sEnvironment }}"
+  replicas: {{ .Values.k8sReplicas }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
+        app: "{{ .Values.k8sName }}"
         group: "{{ .Values.k8sGroupName }}"
         environment: "{{ .Values.k8sEnvironment }}"
+        logging: "{{ .Values.k8sLogging }}"
     spec:
       restartPolicy: Always
       containers:

helm-charts/values.yaml

@@ -6,12 +6,13 @@ k8sName: media-metadata-preprocessor
 k8sNamespace: memobase
 k8sGroupId: di
 k8sGroupName: documents-import
+k8sLogging: scala
 k8sEnvironment: placeholder
-k8sReplicas: placeholder
-k8sRequestsCpu: placeholder
-k8sRequestsMemory: placeholder
-k8sLimitsCpu: placeholder
-k8sLimitsMemory: placeholder
+k8sReplicas: 1
+k8sRequestsCpu: "0.2"
+k8sRequestsMemory: "128Mi"
+k8sLimitsCpu: "0.5"
+k8sLimitsMemory: "300Mi"
 
 applicationId: placeholder