Optionally pass cortex config as configmap.

Fixes cortexproject#235. Signed-off-by: Josh Carp <[email protected]>
jmcarp · Dec 2, 2021 · c3027cc · c3027cc
1 parent 69f8dfb
commit c3027cc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -0,0 +1,12 @@
+{{- if (and (not .Values.useExternalConfig) (.Values.useConfigMap)) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "cortex.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cortex.labels" . | nindent 4 }}
+data:
+  cortex.yaml: |
+    {{- tpl (toYaml .Values.config) . | nindent 4 }}
+{{- end }}
diff --git a/templates/ingester/ingester-dep.yaml b/templates/ingester/ingester-dep.yaml
@@ -118,10 +118,14 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.ingester.terminationGracePeriodSeconds }}
       volumes:
         - name: config
-          secret:
           {{- if .Values.useExternalConfig }}
+          secret:
             secretName: {{ .Values.externalConfigSecretName }}
+          {{- else if .Values.useConfigMap }}
+          configMap:
+            name: {{ template "cortex.fullname" . }}
           {{- else }}
+          secret:
             secretName: {{ template "cortex.fullname" . }}
           {{- end }}
         - name: runtime-config

diff --git a/templates/ingester/ingester-statefulset.yaml b/templates/ingester/ingester-statefulset.yaml
@@ -84,12 +84,16 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.ingester.terminationGracePeriodSeconds }}
       volumes:
         - name: config
+          {{- if .Values.useExternalConfig }}
           secret:
-            {{- if .Values.useExternalConfig }}
             secretName: {{ .Values.externalConfigSecretName }}
-            {{- else }}
+          {{- else if .Values.useConfigMap }}
+          configMap:
+            name: {{ template "cortex.fullname" . }}
+          {{- else }}
+          secret:
             secretName: {{ template "cortex.fullname" . }}
-            {{- end }}
+          {{- end }}
         - name: runtime-config
           configMap:
             name: {{ template "cortex.fullname" . }}-runtime-config

diff --git a/templates/secret.yaml b/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.useExternalConfig }}
+{{- if (and (not .Values.useExternalConfig) (not .Values.useConfigMap)) }}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/values.yaml b/values.yaml
@@ -34,6 +34,7 @@ serviceAccount:
   annotations: {}
   automountServiceAccountToken: true
 
+useConfigMap: true
 useExternalConfig: false
 externalConfigSecretName: 'secret-with-config.yaml'
 externalConfigVersion: '0'