From 3fb65dd5de5943734ea2e94aa7c25a5734e4e1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barri=C3=A8re?= <barriere.fr@gmail.com>
Date: Wed, 12 Aug 2020 14:26:11 +0200
Subject: [PATCH] Add optional secret to pull Docker image in fluent-bit chart
 (#2489)

---
 production/helm/fluent-bit/Chart.yaml               |  2 +-
 production/helm/fluent-bit/templates/daemonset.yaml | 10 ++++++++--
 production/helm/fluent-bit/values.yaml              |  5 +++++
 production/helm/loki-stack/Chart.yaml               |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/production/helm/fluent-bit/Chart.yaml b/production/helm/fluent-bit/Chart.yaml
index fd2afc8763..53f8a01ec9 100644
--- a/production/helm/fluent-bit/Chart.yaml
+++ b/production/helm/fluent-bit/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: fluent-bit
-version: 0.1.5
+version: 0.2.0
 appVersion: v1.5.0
 kubeVersion: "^1.10.0-0"
 description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki"
diff --git a/production/helm/fluent-bit/templates/daemonset.yaml b/production/helm/fluent-bit/templates/daemonset.yaml
index e57b53232c..6652c29646 100644
--- a/production/helm/fluent-bit/templates/daemonset.yaml
+++ b/production/helm/fluent-bit/templates/daemonset.yaml
@@ -35,9 +35,15 @@ spec:
         {{- end }}
     spec:
       serviceAccountName: {{ template "fluent-bit-loki.serviceAccountName" . }}
-    {{- if .Values.priorityClassName }}
+      {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
-    {{- end }}
+      {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
       containers:
         - name: fluent-bit-loki
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/production/helm/fluent-bit/values.yaml b/production/helm/fluent-bit/values.yaml
index 2138c888cb..eaa94c9ac4 100644
--- a/production/helm/fluent-bit/values.yaml
+++ b/production/helm/fluent-bit/values.yaml
@@ -50,6 +50,11 @@ image:
   repository: grafana/fluent-bit-plugin-loki
   tag: 1.5.0-amd64
   pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be present in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  # pullSecrets:
+  #   - myRegistrKeySecretName
 
 nameOverride: fluent-bit-loki
 
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index 01de741595..2304d4624a 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.38.4
+version: 0.39.0
 appVersion: v1.5.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."