From 3b7fbb3bbf604270acb4cdd9226dd80dcfb3f823 Mon Sep 17 00:00:00 2001
From: Terje Sannum <terje@offpiste.org>
Date: Fri, 13 Dec 2019 02:13:17 +0100
Subject: [PATCH] helm: support adding init containers to the loki pod (#1336)

---
 production/helm/loki-stack/Chart.yaml           | 2 +-
 production/helm/loki/Chart.yaml                 | 2 +-
 production/helm/loki/templates/statefulset.yaml | 2 ++
 production/helm/loki/values.yaml                | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index 3bbe243e8e2b..c22802469f36 100644
--- a/production/helm/loki-stack/Chart.yaml
+++ b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.23.0
+version: 0.24.0
 appVersion: v1.2.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
index 81f5ea6c1cf7..1c915924171e 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki
-version: 0.21.0
+version: 0.22.0
 appVersion: v1.2.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
index dd486cf3fc0d..1ca90b7362fd 100644
--- a/production/helm/loki/templates/statefulset.yaml
+++ b/production/helm/loki/templates/statefulset.yaml
@@ -41,6 +41,8 @@ spec:
     {{- end }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.initContainers | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 8bfc435ddee0..b3b99b6e1aef 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -176,6 +176,12 @@ serviceMonitor:
   additionalLabels: {}
   # scrapeTimeout: 10s
 
+initContainers: []
+## Init containers to be added to the loki pod.
+# - name: my-init-container
+#   image: busybox:latest
+#   command: ['sh', '-c', 'echo hello']
+
 extraContainers: []
 ## Additional containers to be added to the loki pod.
 # - name: reverse-proxy