update helm charts for reworked import process

Signed-off-by: Sebastian Schüpbach <sebastian.schuepbach@unibas.ch>

helm-charts/templates/app-config.yml

 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
+  name: "{{ .Values.deploymentName }}-config"
   namespace: memobase
 data:
-  APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobName }}"
-  INSTITUTION_ID: "{{ .Values.institutionId }}"
-  RECORD_SET_ID: "{{ .Values.recordSetId }}"
-  TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobName }}"
-  TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobName }}"
-  TOPIC_PROCESS: "{{ .Values.processId }}-{{ .Values.jobName }}-reporting"
+  APPLICATION_ID: "{{ .Values.applicationId }}"
+  TOPIC_IN: "{{ .Values.inputTopicName }}"
+  TOPIC_OUT: "{{ .Values.outputTopicName }}"
+  TOPIC_PROCESS: "{{ .Values.reportTopicName }}"
   INACCESSIBLE_MEDIAHOSTS: "{{ .Values.inaccessibleMediahosts }}"
   INDEXER_HOST: "{{ .Values.indexerHost }}"
   INDEXER_CONNECT_TIMEOUT_MS: "{{ .Values.indexerConnectTimeoutMs }}"

helm-charts/templates/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ .Values.deploymentName }}"
+  namespace: memobase
+  labels:
+    jobType: "import-process-deployment"
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Values.deploymentName }}
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.deploymentName }}
+        tier: import-process
+    spec:
+      restartPolicy: Always
+      containers:
+        - name: "{{ .Values.deploymentName }}-container"
+          image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
+          imagePullPolicy: Always
+          command: [ "java" ]
+          args: [ "-Xms64m", "-Xmx1g", "-jar", "/app/app.jar" ]
+          resources:
+            requests:
+              cpu: "0.5"
+              memory: "128Mi"
+            limits:
+              cpu: "1"
+              memory: "1Gi"
+          envFrom:
+            - configMapRef:
+                name: "{{ .Values.kafkaConfigs }}"
+            - configMapRef:
+                name: "{{ .Values.deploymentName }}-config"

helm-charts/templates/job.yaml

-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{ .Values.processId }}-{{ .Values.jobName }}"
-  namespace: memobase
-  labels:
-    institutionId: "{{ .Values.institutionId }}"
-    recordSetId: "{{ .Values.recordSetId }}"
-    jobType: "import-job"
-spec:
-  template:
-    spec:
-      containers:
-      - name: "{{ .Values.processId }}-{{ .Values.jobName }}"
-        image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
-        command: ["java"]
-        args: ["-Xms64m", "-Xmx1g", "-jar", "/app/app.jar"]
-        resources:
-          requests:
-            cpu: "0.5"
-            memory: "128Mi"
-          limits:
-            cpu: "1"
-            memory: "1Gi"
-        envFrom:
-        - configMapRef:
-            name: "{{ .Values.kafkaConfigs }}"
-        - configMapRef:
-            name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
-      restartPolicy: Never
-  backoffLimit: 0

helm-charts/values.yaml

@@ -7,8 +7,14 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/media-metadata-extractor"
 tag: "latest"
 
-lastJobName: media-linker
+deploymentName: media-metadata-extractor
+applicationId: media-metadata-extractor-app
+
 kafkaConfigs: prod-kafka-bootstrap-servers
+inputTopicName: import-process-media-linker
+outputTopicName: import-process-media-metadata
+reportingTopicName: import-process-reporting
+
 inaccessibleMediahosts: 'youtu.be,youtube.com,vimeo.com,srf.ch'
 indexerHost: 'http://media-indexer-service:8082'
 indexerConnectTimeoutMs: 4000