helm: Add support for passing arbitrary secrets (grafana#1111)

* Add support for adding secrets and mounting * Add possibility to pass arbitrary env * Bump chart to 0.16.0 * bump chart Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com> Co-authored-by: Cyril Tovena <cyril.tovena@gmail.com>
mraboosk · Oct 9, 2019 · 5a38450 · 5a38450
1 parent 5145899
commit 5a38450
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki-stack
-version: 0.17.0
+version: 0.17.1
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki
-version: 0.15.0
+version: 0.16.0
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/templates/statefulset.yaml b/production/helm/loki/templates/statefulset.yaml
@@ -51,6 +51,9 @@ spec:
             - "-{{ $key }}={{ $value }}"
           {{- end }}
           volumeMounts:
+            {{- if .Values.extraVolumeMounts }}
+              {{ toYaml .Values.extraVolumeMounts | nindent 12}}
+            {{- end }}
             - name: config
               mountPath: /etc/loki
             - name: storage
@@ -69,6 +72,9 @@ spec:
           securityContext:
             readOnlyRootFilesystem: true
           env:
+            {{- if .Values.env }}
+              {{- toYaml .Values.env | nindent 12 }}
+            {{- end }}
             {{- if .Values.tracing.jaegerAgentHost }}
             - name: JAEGER_AGENT_HOST
               value: "{{ .Values.tracing.jaegerAgentHost }}"

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -187,15 +187,22 @@ extraContainers: []
 #     - name: reverse-proxy-auth-config
 #       mountPath: /etc/reverse-proxy-conf
 
+
 extraVolumes: []
 ## Additional volumes to the loki pod.
 # - name: reverse-proxy-auth-config
 #   secret:
 #     secretName: reverse-proxy-auth-config
 
+## Extra volume mounts that will be added to the loki container
+extraVolumeMounts: []
+
 extraPorts: []
 ## Additional ports to the loki services. Useful to expose extra container ports.
 # - port: 11811
 #   protocol: TCP
 #   name: http
 #   targetPort: http
+
+# Extra env variables to pass to the loki container
+env: []