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

Consume index names from config maps.

parent 2fd49459
Pipeline #22636 passed with stages
in 6 minutes and 5 seconds
...@@ -5,9 +5,6 @@ metadata: ...@@ -5,9 +5,6 @@ metadata:
namespace: memobase namespace: memobase
data: data:
APPLICATION_ID: "{{ .Values.deploymentName }}-app" APPLICATION_ID: "{{ .Values.deploymentName }}-app"
DOCUMENTS_INDEX: "{{ .Values.documentsIndex }}"
INSTITUTION_INDEX: "{{ .Values.institutionIndex }}"
RECORD_SET_INDEX: "{{ .Values.recordSetIndex }}"
MEDIA_SERVER_URL: "{{ .Values.mediaServerUrl }}" MEDIA_SERVER_URL: "{{ .Values.mediaServerUrl }}"
UPDATE_TOPIC: "{{ .Values.updateTopic }}" UPDATE_TOPIC: "{{ .Values.updateTopic }}"
TOPIC_IN: "{{ .Values.inputTopic }}" TOPIC_IN: "{{ .Values.inputTopic }}"
......
...@@ -20,6 +20,22 @@ spec: ...@@ -20,6 +20,22 @@ spec:
- name: "{{ .Values.deploymentName }}-container" - name: "{{ .Values.deploymentName }}-container"
image: "{{.Values.registry}}/{{ .Values.image }}:{{ .Values.tag }}" image: "{{.Values.registry}}/{{ .Values.image }}:{{ .Values.tag }}"
imagePullPolicy: Always imagePullPolicy: Always
env:
- name: DOCUMENTS_INDEX
valueFrom:
configMapKeyRef:
name: {{ .Values.documentsIndexSource }}
key: ELASTIC_INDEX
- name: INSTITUTIONS_INDEX
valueFrom:
configMapKeyRef:
name: {{ .Values.institutionIndexSource }}
key: ELASTIC_INDEX
- name: RECORD_SETS_INDEX
valueFrom:
configMapKeyRef:
name: {{ .Values.recordSetIndexSource }}
key: ELASTIC_INDEX
envFrom: envFrom:
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
......
...@@ -7,9 +7,9 @@ deploymentName: search-doc-service ...@@ -7,9 +7,9 @@ deploymentName: search-doc-service
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
elasticConfigs: prod-elastic-configs elasticConfigs: prod-elastic-configs
documentsIndex: documents-v18 documentsIndexSource: documents-index
institutionIndex: institutions-v3 institutionIndexSource: institutions-index
recordSetIndex: record-sets-v3 recordSetIndexSource: record-sets-index
outputTopic: search-doc-output-documents outputTopic: search-doc-output-documents
inputTopic: search-doc-input-documents inputTopic: search-doc-input-documents
reportingTopic: postprocessing-reporting reportingTopic: postprocessing-reporting
......
...@@ -3,8 +3,8 @@ app: ...@@ -3,8 +3,8 @@ app:
host: ${ELASTIC_HOST:?system} host: ${ELASTIC_HOST:?system}
port: ${ELASTIC_PORT:?system} port: ${ELASTIC_PORT:?system}
documentsIndex: ${DOCUMENTS_INDEX:?system} documentsIndex: ${DOCUMENTS_INDEX:?system}
institutionIndex: ${INSTITUTION_INDEX:?system} institutionIndex: ${INSTITUTIONS_INDEX:?system}
recordSetIndex: ${RECORD_SET_INDEX:?system} recordSetIndex: ${RECORD_SETS_INDEX:?system}
media: media:
url: ${MEDIA_SERVER_URL:?system} url: ${MEDIA_SERVER_URL:?system}
institutionTypeLabelsPath: "/configs/institution_types/labels.csv" institutionTypeLabelsPath: "/configs/institution_types/labels.csv"
......
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