From 1cdd3b9968a653db776c505123fcd56f00fb178d Mon Sep 17 00:00:00 2001
From: Vladyslav Diachenko <vlad.diachenko@grafana.com>
Date: Wed, 7 Aug 2024 15:16:41 +0300
Subject: [PATCH] fix(helm): fixed memcached and provisioner templates to
 follow the same patter of specifying imagePullSecrets in the same way as the
 majority of the components have. Otherwise, it's make it impossible to
 specify image pull secrets in all the components at the same time because
 they are incompatible. Previously only components expected to have image pull
 secrets specified in the way: ```yaml imagePullSecrets:   - name: pull-secret
 ``` but provisioner and memcached expected to have the format: ```yaml
 imagePullSecrets:   - pull-secret ```

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
---
 production/helm/loki/CHANGELOG.md                           | 4 ++++
 production/helm/loki/Chart.yaml                             | 2 +-
 production/helm/loki/README.md                              | 2 +-
 .../loki/templates/memcached/_memcached-statefulset.tpl     | 6 ++----
 .../helm/loki/templates/provisioner/job-provisioner.yaml    | 6 ++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index b07cf4ceafd1..ec57c7f404e4 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang
 
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 
+## 6.9.0
+
+- [BUGFIX] Fixed how we set imagePullSecrets for the memcached and provisioner.
+
 ## 6.8.0
 
 - [BUGFIX] Fixed how we set imagePullSecrets for the admin-api and enterprise-gateway
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index c8bc87504456..659d9f516ff7 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -3,7 +3,7 @@ name: loki
 description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 type: application
 appVersion: 3.1.0
-version: 6.8.0
+version: 6.9.0
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md
index 7f3f08bafd49..35f6b9a3faab 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.8.0](https://img.shields.io/badge/Version-6.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+![Version: 6.9.0](https://img.shields.io/badge/Version-6.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
 
 Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 
diff --git a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
index 8310e49dbc72..8e2479af8a05 100644
--- a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
+++ b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl
@@ -70,11 +70,9 @@ spec:
       tolerations:
         {{- toYaml .tolerations | nindent 8 }}
       terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds }}
-      {{- if $.ctx.Values.imagePullSecrets }}
+      {{- with $.ctx.Values.imagePullSecrets }}
       imagePullSecrets:
-      {{- range $.ctx.Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .extraVolumes }}
       volumes:
diff --git a/production/helm/loki/templates/provisioner/job-provisioner.yaml b/production/helm/loki/templates/provisioner/job-provisioner.yaml
index deb6e73c17d0..61fd2be8501b 100644
--- a/production/helm/loki/templates/provisioner/job-provisioner.yaml
+++ b/production/helm/loki/templates/provisioner/job-provisioner.yaml
@@ -37,11 +37,9 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.enterprise.provisioner.securityContext | nindent 8 }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       initContainers:
         - name: provisioner