Commit e08e21ff authored by Lionel Walter's avatar Lionel Walter
Browse files

Remove job id

parent cb9b820b
Pipeline #9777 passed with stages
in 10 minutes and 42 seconds
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-app-config" name: "{{ .Values.processId }}-{{ .Values.jobName }}-app-config"
namespace: memobase namespace: memobase
data: data:
JOB_ID: "{{ .Values.jobId }}" APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobName }}"
APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}"
SHEET_INDEX: "{{ .Values.sheetIndex }}" SHEET_INDEX: "{{ .Values.sheetIndex }}"
HEADER_COUNT: "{{ .Values.headerCount }}" HEADER_COUNT: "{{ .Values.headerCount }}"
HEADER_LINE_INDEX: "{{ .Values.headerLineIndex }}" HEADER_LINE_INDEX: "{{ .Values.headerLineIndex }}"
IDENTIFIER_INDEX: "{{ .Values.identifierIndex }}" IDENTIFIER_INDEX: "{{ .Values.identifierIndex }}"
TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobId }}-{{ .Values.lastJobName }}" TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobName }}"
TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}" TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobName }}"
TOPIC_PROCESS: "{{ .Values.processId }}-reporting" TOPIC_PROCESS: "{{ .Values.processId }}-reporting"
\ No newline at end of file
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}" name: "{{ .Values.processId }}-{{ .Values.jobName }}"
namespace: memobase namespace: memobase
labels: labels:
institutionId: "{{ .Values.institutionId }}" institutionId: "{{ .Values.institutionId }}"
...@@ -11,7 +11,7 @@ spec: ...@@ -11,7 +11,7 @@ spec:
template: template:
spec: spec:
containers: containers:
- name: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}" - name: "{{ .Values.processId }}-{{ .Values.jobName }}"
image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}" image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
envFrom: envFrom:
- secretRef: - secretRef:
...@@ -19,6 +19,6 @@ spec: ...@@ -19,6 +19,6 @@ spec:
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-app-config" name: "{{ .Values.processId }}-{{ .Values.jobName }}-app-config"
restartPolicy: Never restartPolicy: Never
backoffLimit: 0 backoffLimit: 0
...@@ -20,10 +20,6 @@ lastJobName: text-file-validation ...@@ -20,10 +20,6 @@ lastJobName: text-file-validation
jobName: table-data-transform jobName: table-data-transform
processId: p0001 processId: p0001
jobId: j0002
# the id of the previous job in this import process
lastJobId: j0001
institutionId: placeholder institutionId: placeholder
recordSetId: placeholder recordSetId: placeholder
......
Supports Markdown
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