Merge branch 'deployment-transform'

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 }}"
-  IS_PUBLISHED: "{{ .Values.isPublished }}"
-  TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobName }}"
-  TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobName }}"
-  TOPIC_PROCESS: "{{ .Values.processId }}-reporting"
\ No newline at end of file
+  APPLICATION_ID: {{ .Values.applicationId }}
+  TOPIC_IN: {{ .Values.inputTopicName }}
+  TOPIC_OUT: {{ .Values.outputTopicName }}
+  TOPIC_PROCESS: {{ .Values.reportingTopicName }}
\ No newline at end of file

helm-charts/templates/job.yaml → helm-charts/templates/deployment.yaml

-apiVersion: batch/v1
-kind: Job
+apiVersion: apps/v1
+kind: Deployment
+
 metadata:
-  name: "{{ .Values.processId }}-{{ .Values.jobName }}"
+  name: {{ .Values.deploymentName }}
   namespace: memobase
   labels:
-    institutionId: "{{ .Values.institutionId }}"
-    recordSetId: "{{ .Values.recordSetId }}"
-    jobType: "import-job"
+    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.processId }}-{{ .Values.jobName }}"
+      - name: "{{ .Values.deploymentName }}-container"
         image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
+        imagePullPolicy: Always
         envFrom:
         - configMapRef:
             name: "{{ .Values.kafkaConfigs }}"
         - configMapRef:
-            name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
-        volumeMounts:
-          - name: config-volume
-            mountPath: "/configs/mappings/"
-      volumes:
-        - name: config-volume
-          configMap:
-            name: "{{ .Values.processId }}-{{ .Values.configMapName }}"
-      restartPolicy: Never
-  backoffLimit: 0
+            name: "{{ .Values.deploymentName }}-config"
\ No newline at end of file

helm-charts/values.yaml

@@ -7,21 +7,20 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/mapper-service"
 tag: "latest"
 
-lastJobName: table-data-transform
+deploymentName: mapper-service
+## TODO: This needs to be solved differently. This way it is not possible to deploy a replica-set.
+## somehow the id needs to be dependent on the pod name?
+applicationId: mapper-service-app
+
 kafkaConfigs: prod-kafka-bootstrap-servers
 # configMapName holds the name of the config with the mappings for the service.
 configMapName: mapper-service-mapping-config
 
-############################################
-## Values below should be defined via the  #
-## User Interface (Drupal)                 #
-############################################
-jobName: mapper-service
-processId: p0001
-
-institutionId: placeholder
-recordSetId: placeholder
 isPublished: false
 
 #the filename of the mapping
 configFileName: mapping.yml
+
+inputTopicName: import-process-mapper
+outputTopicName: import-process-media-linker
+reportingTopicName: import-process-reporting
\ No newline at end of file

src/main/resources/app.yml

 app:
-  institutionId: ${INSTITUTION_ID:?user}
-  recordSetId: ${RECORD_SET_ID:?user}
-  configs: /configs/mappings
   isPublished: ${IS_PUBLISHED:?user}
 kafka:
   streams: