Commit ca225542 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Merge

parents 54764c26 ea6740f7
Pipeline #20354 failed with stages
in 2 minutes and 47 seconds
......@@ -93,4 +93,4 @@ plugins.withType(DistributionPlugin) {
distTar {
archiveFileName = 'app.tar'
}
}
\ No newline at end of file
}
apiVersion: v1
kind: ConfigMap
metadata:
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
name: "{{ .Values.deploymentName }}-config"
namespace: memobase
data:
APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobName }}"
SHEET_INDEX: "{{ .Values.sheetIndex }}"
HEADER_COUNT: "{{ .Values.headerCount }}"
HEADER_LINE_INDEX: "{{ .Values.headerLineIndex }}"
IDENTIFIER_INDEX: "{{ .Values.identifierIndex }}"
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
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 }}"
image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
......@@ -19,6 +26,4 @@ spec:
- configMapRef:
name: "{{ .Values.kafkaConfigs }}"
- configMapRef:
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
restartPolicy: Never
backoffLimit: 0
name: "{{ .Values.deploymentName }}-config"
\ No newline at end of file
......@@ -3,12 +3,6 @@ sftp:
port: ${SFTP_PORT:?system}
user: ${SFTP_USER:?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:
streams:
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