Skip to content
Snippets Groups Projects
Commit c16998c0 authored by Nicolas Dandrimont's avatar Nicolas Dandrimont
Browse files

indexers: migrate to templated objstorage configuration

parent 2af9cf9c
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@ data:
{{- include "swh.service.fromYaml" (dict "service" "indexer_storage"
"configurationRef" .Values.indexers.indexerStorageConfigurationRef
"Values" .Values) | nindent 4 }}
{{- include "swh.service.fromYaml" (dict "service" "objstorage"
{{- include "swh.objstorageConfiguration" (dict "serviceName" "objstorage"
"configurationRef" .Values.indexers.objstorageConfigurationRef
"Values" .Values) | nindent 4 }}
{{- include "swh.journalClientConfiguration" (dict "serviceType" "journal" "configurationRef" $journalClientConfigurationRef
......
......@@ -4,6 +4,7 @@
{{- $indexer_name := ( print "indexer-" $indexer_type ) -}}
{{- $configurationChecksum := include "swh.indexer.configmap" (dict "indexer_type" $indexer_type "deployment_config" $deployment_config "Values" $.Values) -}}
{{- $journalConfigurationRef := or $deployment_config.journalClientConfigurationRef $.Values.indexers.journalClientConfigurationRef -}}
{{- $objstorageConfigurationRef := or $deployment_config.objstorageConfigurationRef $.Values.indexers.objstorageConfigurationRef -}}
---
apiVersion: apps/v1
kind: Deployment
......@@ -47,6 +48,8 @@ spec:
env:
{{ include "swh.secrets.environment" (dict "Values" $.Values
"configurationRef" $journalConfigurationRef ) | nindent 10 }}
{{ include "swh.secrets.environment" (dict "Values" $.Values
"configurationRef" $objstorageConfigurationRef ) | nindent 10 }}
volumeMounts:
- name: configuration
mountPath: /etc/swh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment