Commit 8a921914 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update chart & dependencies

Removes job id from configs.
parent a934157b
......@@ -35,21 +35,17 @@ dependencies {
// https://mvnrepository.com/artifact/org.elasticsearch.client/elasticsearch-rest-high-level-client
//compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '7.1.0'
implementation 'org.memobase:memobase-service-utilities:1.2.1'
implementation 'org.memobase:memobase-service-utilities:1.3.0'
// Logging Framework
implementation "org.apache.logging.log4j:log4j-api:${log4jV}"
implementation "org.apache.logging.log4j:log4j-core:${log4jV}"
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jV}"
// Kafka Imports
//implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV
implementation "org.apache.kafka:kafka-streams:${kafkaV}"
implementation 'org.apache.jena:apache-jena:3.14.0'
// YAML Parser
implementation 'org.snakeyaml:snakeyaml-engine:2.1'
// JSON Parser
implementation 'com.beust:klaxon:5.2'
// Compression
......
apiVersion: v1
kind: ConfigMap
metadata:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-app-config"
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
namespace: memobase
data:
JOB_ID: "{{ .Values.jobId }}"
APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}"
APPLICATION_ID: "{{ .Values.processId }}-{{ .Values.jobName }}"
INSTITUTION_ID: "{{ .Values.institutionId }}"
RECORD_SET_ID: "{{ .Values.recordSetId }}"
TOPIC_IN: "{{ .Values.processId }}-{{ .Values.lastJobId }}-{{ .Values.lastJobName }}"
TOPIC_OUT: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}"
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
kind: Job
metadata:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}"
name: "{{ .Values.processId }}-{{ .Values.jobName }}"
namespace: memobase
labels:
institutionId: "{{ .Values.institutionId }}"
......@@ -11,13 +11,13 @@ spec:
template:
spec:
containers:
- name: "{{ .Values.processId }}-{{ .Values.jobId }}-{{ .Values.jobName }}"
- name: "{{ .Values.processId }}-{{ .Values.jobName }}"
image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
envFrom:
- configMapRef:
name: "{{ .Values.kafkaConfigs }}"
- configMapRef:
name: "{{ .Values.processId }}-{{ .Values.jobId }}-app-config"
name: "{{ .Values.processId }}-{{ .Values.jobName }}-config"
volumeMounts:
- name: config-volume
mountPath: "/configs/mappings/{{ .Values.configFileName }}"
......
......@@ -3,12 +3,11 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/mapper-service"
tag: "latest"
jobName: mapper-service
processId: p0001
jobId: j0003
lastJobId: j0002
jobName: mapper-service
lastJobName: table-data-transform
kafkaConfigs: prod-kafka-bootstrap-servers
institutionId: placeholder
......
id: ${JOB_ID:?system}
app:
institutionId: ${INSTITUTION_ID:?system}
recordSetId: ${RECORD_SET_ID:?system}
......
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