diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index ff9eca098eb6b..5acf2dc254155 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -5700,6 +5700,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 a9cead21ece46..7a976f43efc09 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,17 +13,21 @@ 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.10.2 + +- [ENHANCEMENT] Add support for OpenStack application credentials when using Swift for storage + ## 6.10.1 - [CHANGE] Bumped version of `kiwigrid/k8s-sidecar` to 1.27.5; this remediates several CVE + ## 6.10.0 - [CHANGE] Changed version of Grafana Enterprise Logs to 3.1.1 - [CHANGE] Changed version of Grafana Loki to 3.1.1 - [ENHANCEMENT] Added ability to disable AWS S3 dualstack endpoint usage. - ## 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 52b52d5af56a6..9c6acfe2bdd28 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.1 -version: 6.10.1 +version: 6.10.2 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 4ec80d2b4db29..e07703abfa704 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -377,6 +377,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 }} @@ -384,7 +393,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: {{ . }} @@ -392,7 +403,9 @@ swift: {{- with .user_id }} user_id: {{ . }} {{- end }} - password: {{ .password }} + {{- with .password }} + password: {{ . }} + {{- end }} {{- with .domain_id }} domain_id: {{ . }} {{- end }} @@ -461,6 +474,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 }} @@ -468,7 +490,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: {{ . }} @@ -476,7 +500,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 9a5b451b9a638..3eeb68fd83350 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -344,6 +344,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