From 3be5a4576fd0f0dca321e017a637f7a3159c00e5 Mon Sep 17 00:00:00 2001
From: Dylan Guedes <djmgguedes@gmail.com>
Date: Mon, 5 Aug 2024 17:59:21 -0300
Subject: [PATCH] fix(break): helm: Fix how we set imagePullSecrets for
 enterprise-gateway and admin-api. (#13761)

---
 production/helm/loki/CHANGELOG.md                           | 4 ++++
 production/helm/loki/Chart.yaml                             | 2 +-
 production/helm/loki/README.md                              | 2 +-
 .../helm/loki/templates/admin-api/deployment-admin-api.yaml | 6 ++----
 .../templates/gateway/deployment-gateway-enterprise.yaml    | 6 ++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index ad24a1ceb348c..b07cf4ceafd1c 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.8.0
+
+- [BUGFIX] Fixed how we set imagePullSecrets for the admin-api and enterprise-gateway
+
 ## 6.7.4
 
 - [ENHANCEMENT] Allow configuring the SSE section under AWS S3 storage config.
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 9e84333dee63f..c8bc875044569 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.7.4
+version: 6.8.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 701ae4059140c..7f3f08bafd49a 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.7.4](https://img.shields.io/badge/Version-6.7.4-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.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)
 
 Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 
diff --git a/production/helm/loki/templates/admin-api/deployment-admin-api.yaml b/production/helm/loki/templates/admin-api/deployment-admin-api.yaml
index 15391665ca776..650c72fc15983 100644
--- a/production/helm/loki/templates/admin-api/deployment-admin-api.yaml
+++ b/production/helm/loki/templates/admin-api/deployment-admin-api.yaml
@@ -65,11 +65,9 @@ spec:
               mountPath: {{ .Values.minio.configPathmc }}certs
           {{ end }}
         {{- end }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.adminApi.hostAliases }}
       hostAliases:
diff --git a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
index de8ba11058eb1..746fa6142b771 100644
--- a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
+++ b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
@@ -46,11 +46,9 @@ spec:
         {{- toYaml .Values.enterpriseGateway.podSecurityContext | nindent 8 }}
       initContainers:
         {{- toYaml .Values.enterpriseGateway.initContainers | nindent 8 }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.enterpriseGateway.hostAliases }}
       hostAliases: