fix helm settings

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

helm-charts/helm-values/di-connector-prod.yaml

+applicationId: di-connector-prod
 deploymentName: di-connector-prod
 kafkaConfigs: prod-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/helm-values/di-connector-stage.yaml

+applicationId: di-connector-stage
 deploymentName: di-connector-stage
 kafkaConfigs: prod-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/helm-values/di-connector-test.yaml

+applicationId: di-connector-test
 deploymentName: di-connector-test
 kafkaConfigs: test-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/helm-values/gi-connector-prod.yaml

+applicationId: gi-connector-prod
 deploymentName: gi-connector-prod
 kafkaConfigs: prod-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/helm-values/gi-connector-stage.yaml

+applicationId: gi-connector-stage
 deploymentName: gi-connector-stage
 kafkaConfigs: prod-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/helm-values/gi-connector-test.yaml

+applicationId: gi-connector-test
 deploymentName: gi-connector-test
 kafkaConfigs: test-kafka-bootstrap-servers
 # This is only the base name!

helm-charts/templates/app-config.yml

@@ -4,6 +4,7 @@ metadata:
   name: "{{ .Values.deploymentName }}-app-config"
   namespace: memobase
 data:
+  APPLICATION_ID: "{{ .Values.applicationId }}"
   TOPIC_IN: "{{ .Values.inputTopic }}"
   TOPIC_OUT: "{{ .Values.outputTopic }}"
   TOPIC_OUT_POSTFIX: "{{ .Values.outputTopicPostfix }}"

helm-charts/templates/deployment-drupal.yml

@@ -25,9 +25,4 @@ spec:
               name: "{{ .Values.kafkaConfigs }}"
           - configMapRef:
               name: "{{ .Values.deploymentName}}-app-config"
-          env:
-            - name: TOPIC_IN
-              value: mb-gi-rdf-objects-prod
-            - name: APPLICATION_ID
-              value: "{{ .Values.deploymentName }}-drupal-deployment"
       restartPolicy: Always

helm-charts/templates/deployment.yml

@@ -25,9 +25,4 @@ spec:
               name: "{{ .Values.kafkaConfigs }}"
           - configMapRef:
               name: "{{ .Values.deploymentName}}-app-config"
-          env:
-            - name: TOPIC_IN
-              value: import-process-ingest
-            - name: APPLICATION_ID
-              value: "{{ .Values.deploymentName }}-deployment"
       restartPolicy: Always

helm-charts/values.yaml

@@ -7,6 +7,7 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/postprocessing/import-process-bridge"
 tag: "latest"
 
+applicationId: placeholder
 deploymentName: placeholder
 kafkaConfigs: placeholder
 outputTopic: placeholder