Update k8s labels

helm-charts/helm-values/di-media-converter-prod.yaml

@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi"
 kafkaConfigs: prod-kafka-bootstrap-servers
 inputTopicName: mb-di-processed-records-prod
 reportingTopicName: mb-di-reporting-prod
-applicationId: prod-iiif-manifest-creator
 groupId: prod-media-converter
 clientId: prod-media-converter-client
 

helm-charts/helm-values/di-media-converter-stage.yaml

@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi"
 kafkaConfigs: prod-kafka-bootstrap-servers
 inputTopicName: mb-di-processed-records-stage
 reportingTopicName: mb-di-reporting-stage
-applicationId: stage-iiif-manifest-creator
 groupId: stage-media-converter
 clientId: stage-media-converter-client
 

helm-charts/helm-values/di-media-converter-test.yaml

@@ -8,7 +8,6 @@ k8sLimitsMemory: "2Gi"
 kafkaConfigs: test-kafka-bootstrap-servers
 inputTopicName: mb-di-processed-records-prod
 reportingTopicName: mb-di-reporting-prod
-applicationId: test-iiif-manifest-creator
 groupId: test-media-converter
 clientId: test-media-converter-client
 

helm-charts/templates/app-config.yaml

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

helm-charts/templates/deployment.yaml

@@ -4,18 +4,23 @@ metadata:
   name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
   namespace: "{{ .Values.k8sNamespace }}"
   labels:
-    app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
+    app: "{{ .Values.k8sName }}"
+    environment: "{{ .Values.k8sEnvironment }}"
+    group: "{{ .Values.k8sGroupName }}"
 spec:
   selector:
     matchLabels:
-      app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
-  replicas: {{ .Values.k8sReplicas}}
+      app: "{{ .Values.k8sName }}"
+      environment: "{{ .Values.k8sEnvironment }}"
+      group: "{{ .Values.k8sGroupName }}"
+  replicas: {{ .Values.k8sReplicas }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
-        group: "{{ .Values.k8sGroupName }}"
+        app: "{{ .Values.k8sName }}"
         environment: "{{ .Values.k8sEnvironment }}"
+        group: "{{ .Values.k8sGroupName }}"
+        logging: "{{ .Values.k8sLogging }}"
     spec:
       containers:
         - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-container"

helm-charts/values.yaml

@@ -7,6 +7,7 @@ k8sNamespace: memobase
 k8sGroupId: di
 k8sGroupName: documents-import
 k8sEnvironment: placeholder
+k8sLogging: sca
 k8sReplicas: placeholder
 k8sRequestsCpu: placeholder
 k8sRequestsMemory: placeholder
@@ -16,7 +17,6 @@ k8sLimitsMemory: placeholder
 kafkaConfigs: placeholder
 inputTopicName: placeholder
 reportingTopicName: placeholder
-applicationId: placeholder
 groupId: placeholder
 clientId: placeholder