From e2450624876e0c3634bb769dfb5a1252267a7a9d Mon Sep 17 00:00:00 2001 From: Travis Holton Date: Thu, 20 Jun 2024 07:45:24 +1200 Subject: [PATCH] Support 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/README.md | 2 +- production/helm/loki/templates/_helpers.tpl | 51 +++++++++++++++++--- production/helm/loki/values.yaml | 3 ++ 6 files changed, 57 insertions(+), 8 deletions(-) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 76b4936f20bfd..e308aaf1af094 100644 --- 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 index 879fe4827c83f..2e90a98362669 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 [//]: # ( : 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 index bd2f78049a816..14500b78b3962 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.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 index a207de47c39a6..1197ff2090bf9 100644 --- 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 index 572ef9a5e7846..0880cfb64cb27 100644 --- 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 }} @@ -307,7 +316,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: {{ . }} @@ -315,7 +326,9 @@ swift: {{- with .user_id }} user_id: {{ . }} {{- end }} - password: {{ .password }} + {{- with .password }} + password: {{ . }} + {{- end }} {{- with .domain_id }} domain_id: {{ . }} {{- end }} @@ -409,6 +422,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 }} @@ -416,7 +438,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: {{ . }} @@ -424,7 +448,9 @@ swift: {{- with .user_id }} user_id: {{ . }} {{- end }} - password: {{ .password }} + {{- with .password }} + password: {{ . }} + {{- end }} {{- with .domain_id }} domain_id: {{ . }} {{- end }} @@ -493,6 +519,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 }} @@ -500,7 +535,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: {{ . }} @@ -508,7 +545,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 6485a59e71c0a..36df966913834 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