From 8d334e6b1b682f11a4e62fe302e42e2d0b359c9e Mon Sep 17 00:00:00 2001
From: Travis Holton <travisholton@catalystcloud.nz>
Date: Thu, 20 Jun 2024 07:45:24 +1200
Subject: [PATCH] Helm chart support for OpenStack application credentials

---
 docs/sources/setup/install/helm/reference.md |  3 ++
 production/helm/loki/CHANGELOG.md            |  4 +++
 production/helm/loki/Chart.yaml              |  2 +-
 production/helm/loki/templates/_helpers.tpl  | 34 +++++++++++++++++---
 production/helm/loki/values.yaml             |  3 ++
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index 8136018909684..83996d96d6d7f 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -5699,6 +5699,9 @@ null
     "signatureVersion": null
   },
   "swift": {
+    "application_credential_id": null,
+    "application_credential_name": null,
+    "application_credential_secret": null,
     "auth_url": null,
     "auth_version": null,
     "connect_timeout": null,
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index ec57c7f404e48..393105100c6a6 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.1
+
+- [ENHANCEMENT] Add support for OpenStack application credentials when using Swift for storage
+
 ## 6.9.0
 
 - [BUGFIX] Fixed how we set imagePullSecrets for the memcached and provisioner.
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 659d9f516ff7c..bbce061019ce3 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.9.0
+version: 6.9.1
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
index 91b453efa062a..04dcd76a34573 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -374,6 +374,15 @@ azure:
 {{- else if eq .Values.loki.storage.type "swift" -}}
 {{- with .Values.loki.storage.swift }}
 swift:
+  {{- with .application_credential_id }}
+  application_credential_id: {{ . }}
+  {{- end }}
+  {{- with .application_credential_name }}
+  application_credential_name: {{ . }}
+  {{- end }}
+  {{- with .application_credential_secret }}
+  application_credential_secret: {{ . }}
+  {{- end }}
   {{- with .auth_version }}
   auth_version: {{ . }}
   {{- end }}
@@ -381,7 +390,9 @@ swift:
   {{- with .internal }}
   internal: {{ . }}
   {{- end }}
-  username: {{ .username }}
+  {{- with .username }}
+  username: {{ . }}
+  {{- end }}
   user_domain_name: {{ .user_domain_name }}
   {{- with .user_domain_id }}
   user_domain_id: {{ . }}
@@ -389,7 +400,9 @@ swift:
   {{- with .user_id }}
   user_id: {{ . }}
   {{- end }}
-  password: {{ .password }}
+  {{- with .password }}
+  password: {{ . }}
+  {{- end }}
   {{- with .domain_id }}
   domain_id: {{ . }}
   {{- end }}
@@ -458,6 +471,15 @@ storage:
   {{- with .Values.loki.storage.swift }}
   backend: "swift"
   swift:
+    {{- with .application_credential_id }}
+    application_credential_id: {{ . }}
+    {{- end }}
+    {{- with .application_credential_name }}
+    application_credential_name: {{ . }}
+    {{- end }}
+    {{- with .application_credential_secret }}
+    application_credential_secret: {{ . }}
+    {{- end }}
     {{- with .auth_version }}
     auth_version: {{ . }}
     {{- end }}
@@ -465,7 +487,9 @@ storage:
     {{- with .internal }}
     internal: {{ . }}
     {{- end }}
-    username: {{ .username }}
+    {{- with .username }}
+    username: {{ . }}
+    {{- end }}
     user_domain_name: {{ .user_domain_name }}
     {{- with .user_domain_id }}
     user_domain_id: {{ . }}
@@ -473,7 +497,9 @@ storage:
     {{- with .user_id }}
     user_id: {{ . }}
     {{- end }}
-    password: {{ .password }}
+    {{- with .password }}
+    password: {{ . }}
+    {{- end }}
     {{- with .domain_id }}
     domain_id: {{ . }}
     {{- end }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 7c06497d26d21..c927417745439 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -343,6 +343,9 @@ loki:
       requestTimeout: null
       endpointSuffix: null
     swift:
+      application_credential_id: null
+      application_credential_name: null
+      application_credential_secret: null
       auth_version: null
       auth_url: null
       internal: null