Due to a scheduled upgrade to version 14.10, GitLab will be unavailabe on Monday 30.05., from 19:00 until 20:00.

Commit 925d8be7 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Merge branch 'master' into feature/refactor-import-process

parents 9a32fc10 ca225542
Pipeline #20355 failed with stages
in 1 minute and 42 seconds
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config" name: "{{ .Values.deploymentName }}-config"
namespace: memobase namespace: memobase
data: data:
APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobName }}" APPLICATION_ID: {{ .Values.applicationId }}
SHEET_INDEX: "{{ .Values.sheetIndex }}" TOPIC_IN: {{ .Values.inputTopicName }}
HEADER_COUNT: "{{ .Values.headerCount }}" TOPIC_OUT: {{ .Values.outputTopicName }}
HEADER_LINE_INDEX: "{{ .Values.headerLineIndex }}" TOPIC_PROCESS: {{ .Values.reportingTopicName }}
IDENTIFIER_INDEX: "{{ .Values.identifierIndex }}" \ No newline at end of file
TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobName }}"
TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobName }}"
TOPIC_PROCESS: "{{ .Values.processId }}-reporting"
\ No newline at end of file
apiVersion: batch/v1 apiVersion: apps/v1
kind: Job kind: Deployment
metadata: metadata:
name: "{{ .Values.processId }}-{{ .Values.jobName }}" name: {{ .Values.deploymentName }}
namespace: memobase namespace: memobase
labels: labels:
institutionId: "{{ .Values.institutionId }}" jobType: "import-process-deployment"
recordSetId: "{{ .Values.recordSetId }}"
jobType: "import-job"
spec: spec:
selector:
matchLabels:
app: {{ .Values.deploymentName }}
replicas: 1
template: template:
metadata:
labels:
app: {{ .Values.deploymentName }}
tier: import-process
spec: spec:
restartPolicy: Always
containers: containers:
- name: "{{ .Values.processId }}-{{ .Values.jobName }}" - name: "{{ .Values.processId }}-{{ .Values.jobName }}"
image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}" image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
...@@ -19,6 +26,4 @@ spec: ...@@ -19,6 +26,4 @@ spec:
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config" name: "{{ .Values.deploymentName }}-config"
restartPolicy: Never \ No newline at end of file
backoffLimit: 0
...@@ -3,12 +3,6 @@ sftp: ...@@ -3,12 +3,6 @@ sftp:
port: ${SFTP_PORT:?system} port: ${SFTP_PORT:?system}
user: ${SFTP_USER:?system} user: ${SFTP_USER:?system}
password: ${SFTP_PASSWORD:?system} password: ${SFTP_PASSWORD:?system}
app:
sheet: ${SHEET_INDEX:?user}
header:
count: ${HEADER_COUNT:?user}
line: ${HEADER_LINE_INDEX:?user}
identifier: ${IDENTIFIER_INDEX:?user}
kafka: kafka:
streams: streams:
bootstrap.servers: ${KAFKA_BOOTSTRAP_SERVERS:?system} bootstrap.servers: ${KAFKA_BOOTSTRAP_SERVERS:?system}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment