In order to mitigate against the brute force attacks against Gitlab accounts, we are moving to all edu-ID Logins. We would like to remind you to link your account with your edu-id. Login will be possible only by edu-ID after November 30, 2021. Here you can find the instructions for linking your account.

If you don't have a SWITCH edu-ID, you can create one with this guide here

kind regards

This Server has been upgraded to GitLab release 14.2.6

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

Update deployment

parent d87b64ce
Pipeline #27646 passed with stages
in 3 minutes and 36 seconds
......@@ -3,5 +3,6 @@ kafkaConfigs: prod-kafka-bootstrap-servers
inputTopic: di-processed-reports-prod
reportingTopic: di-reporting-reports-prod
importApiEndpoint: https://import.memobase.k8s.unibas.ch
whitelistFileConfig: prod-reports-consumer-step-whitelist
k8sEnvironment: prod
......@@ -3,5 +3,6 @@ kafkaConfigs: stage-kafka-bootstrap-servers
inputTopic: di-processed-reports-stage
reportingTopic: di-reporting-reports-stage
importApiEndpoint: https://stage.import.memobase.k8s.unibas.ch
whitelistFileConfig: stage-reports-consumer-step-whitelist
k8sEnvironment: stage
......@@ -5,6 +5,7 @@ metadata:
namespace: memobase
data:
API_ENDPOINT_URL: "{{ .Values.importApiEndpoint }}"
STEP_WHITE_LIST_FILE_PATH: "{{ .Values.whitelistFilePath }}"
APPLICATION_ID: "{{ .Values.deploymentName }}-{{ .Values.k8sEnvironment }}-app"
TOPIC_IN: "{{ .Values.inputTopic }}"
TOPIC_OUT: "not-used"
......
......@@ -32,4 +32,11 @@ spec:
name: "{{ .Values.kafkaConfigs }}"
- configMapRef:
name: "{{ .Values.deploymentName}}-app-config"
volumeMounts:
- name: {{ .Values.whitelistFileConfig }}
mountPath: {{ .Values.whitelistFilePath }}
volumes:
- name: {{ .Values.whitelistFileConfig }}
configMap:
name: {{ .Values.whitelistFileConfig }}
restartPolicy: Always
......@@ -14,4 +14,6 @@ deploymentName: placeholder
kafkaConfigs: placeholder
inputTopic: placeholder
reportingTopic: placeholder
importApiEndpoint: placeholder
\ No newline at end of file
importApiEndpoint: placeholder
whitelistFilePath: /configs/whitelist.txt
whitelistFileConfig: placeholder
\ No newline at end of file
......@@ -52,6 +52,7 @@ class Service(file: String = "app.yml") {
.mapNotNull { klaxon.parse<IndexReport>(it.value()) }
.filter { stepWhitelist.check(it.report.step) }
.forEach {
log.info("Processing report: " + it.report.id + "; " + it.report.step)
if (it.metadata.institutionId == "none") {
collector.addReport(
it.metadata.recordSetId,
......
app:
importApiUrl: ${API_ENDPOINT_URL:?system}
whitelistFilePath: ${STEP_WHITE_LIST_FILE_PATH:?system}
kafka:
consumer:
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