From 68b23dc2b5c74b9175d5e24fb445748c422cb7b6 Mon Sep 17 00:00:00 2001
From: Blocka <ken89@kimo.com>
Date: Sat, 20 Apr 2024 00:24:24 +0800
Subject: [PATCH] fix: Missing password for Loki-Canary when loki.auth_enabled
 is true (#12411)

Co-authored-by: J Stickler <julie.stickler@grafana.com>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
---
 docs/sources/setup/install/helm/reference.md          | 11 +++++++++++
 production/helm/loki/CHANGELOG.md                     |  4 ++++
 production/helm/loki/Chart.yaml                       |  2 +-
 production/helm/loki/README.md                        |  2 +-
 .../helm/loki/templates/loki-canary/daemonset.yaml    |  1 +
 production/helm/loki/values.yaml                      |  2 ++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index 36d4ae9678a6..529bf63b7570 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -6420,6 +6420,7 @@ false
     },
     "tenant": {
       "name": "self-monitoring",
+      "password": null,
       "secretNamespace": "{{ .Release.Namespace }}"
     }
   },
@@ -6697,6 +6698,7 @@ null
 			<td><pre lang="json">
 {
   "name": "self-monitoring",
+  "password": null,
   "secretNamespace": "{{ .Release.Namespace }}"
 }
 </pre>
@@ -6709,6 +6711,15 @@ null
 			<td><pre lang="json">
 "self-monitoring"
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>monitoring.selfMonitoring.tenant.password</td>
+			<td>string</td>
+			<td>Password of the gateway for Basic auth</td>
+			<td><pre lang="json">
+null
+</pre>
 </td>
 		</tr>
 		<tr>
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index f8e2f1392e7f..2927e1f5e033 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.3.2
+
+- [BUGFIX] Missing password for Loki-Canary when loki.auth_enabled is true
+
 ## 6.3.1
 
 - [BUGFIX] Fixed Typo in Ingester templates for zoneAwareReplication
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index a83dbc6865bc..044ec14ad158 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 in simple, scalable mode
 type: application
 appVersion: 3.0.0
-version: 6.3.1
+version: 6.3.2
 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 61b7403c7d5a..5c99119350fb 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.3.1](https://img.shields.io/badge/Version-6.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 6.3.2](https://img.shields.io/badge/Version-6.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Helm chart for Grafana Loki in simple, scalable mode
 
diff --git a/production/helm/loki/templates/loki-canary/daemonset.yaml b/production/helm/loki/templates/loki-canary/daemonset.yaml
index e9998dcef67f..dc5c6296891c 100644
--- a/production/helm/loki/templates/loki-canary/daemonset.yaml
+++ b/production/helm/loki/templates/loki-canary/daemonset.yaml
@@ -51,6 +51,7 @@ spec:
             {{- else if $.Values.loki.auth_enabled }}
             - -user={{ $.Values.monitoring.selfMonitoring.tenant.name }}
             - -tenant-id={{ $.Values.monitoring.selfMonitoring.tenant.name }}
+            - -pass={{ $.Values.monitoring.selfMonitoring.tenant.password }}
             {{- end }}
             {{- if .push }}
             - -push=true
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 009aa265c3e5..855e75c551fd 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -3261,6 +3261,8 @@ monitoring:
     tenant:
       # -- Name of the tenant
       name: "self-monitoring"
+      # -- Password of the gateway for Basic auth
+      password: null
       # -- Namespace to create additional tenant token secret in. Useful if your Grafana instance
       # is in a separate namespace. Token will still be created in the canary namespace.
       secretNamespace: "{{ .Release.Namespace }}"