Support OpenStack application credentials

grafana · Jun 19, 2024 · 273d4ea · 273d4ea
1 parent 1d6f8d5
commit 273d4ea
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
@@ -5690,6 +5690,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
@@ -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.7.0
+
+- [ENHANCEMENT] Add support for OpenStack application credentials when using Swift for storage
+
 ## 6.6.4
 
 - [BUGFIX] Fix extraObjects

diff --git 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.0.0
-version: 6.6.3
+version: 6.7.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
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.6.3](https://img.shields.io/badge/Version-6.6.3-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.7.0](https://img.shields.io/badge/Version-6.7.0-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 and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 

diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
@@ -300,6 +300,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 }}
@@ -315,7 +324,9 @@ swift:
   {{- with .user_id }}
   user_id: {{ . }}
   {{- end }}
-  password: {{ .password }}
+  {{- with .password }}
+  password: {{ . }}
+  {{- end }}
   {{- with .domain_id }}
   domain_id: {{ . }}
   {{- end }}
@@ -493,6 +504,18 @@ 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 .application_credential_id }}
+    application_credential_id: {{ . }}
+    {{- end }}
     {{- with .auth_version }}
     auth_version: {{ . }}
     {{- end }}
@@ -508,7 +531,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
@@ -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