Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(helm): Helm support OpenStack application credentials for Swift storage #13266

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −6
Open

feat(helm): Helm support OpenStack application credentials for Swift storage #13266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6090,6 +6090,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,
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ Entries should include a reference to the pull request that introduced the chang
- [FIX] Do not create bloom planner, bloom builder, bloom gateway Deployment/Statefulset if their replica count is 0.
- [FIX] Configure (ephemeral) storage for bloom builder working directory
- [ENHANCEMENT] Automatically configure bloom planner address for bloom builders and bloom gateway addresses for bloom gateway clients.
## 6.12.1

- [ENHANCEMENT] Add support for OpenStack application credentials when using Swift for storage

## 6.12.0

Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.0
version: 6.13.1
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.13.0](https://img.shields.io/badge/Version-6.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
![Version: 6.13.1](https://img.shields.io/badge/Version-6.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Expand Down
34 changes: 30 additions & 4 deletions production/helm/loki/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,22 +377,35 @@ 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 }}
auth_url: {{ .auth_url }}
{{- with .internal }}
internal: {{ . }}
{{- end }}
username: {{ .username }}
{{- with .username }}
username: {{ . }}
{{- end }}
user_domain_name: {{ .user_domain_name }}
{{- with .user_domain_id }}
user_domain_id: {{ . }}
{{- end }}
{{- with .user_id }}
user_id: {{ . }}
{{- end }}
password: {{ .password }}
{{- with .password }}
password: {{ . }}
{{- end }}
{{- with .domain_id }}
domain_id: {{ . }}
{{- end }}
Expand Down Expand Up @@ -461,22 +474,35 @@ 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 }}
auth_url: {{ .auth_url }}
{{- with .internal }}
internal: {{ . }}
{{- end }}
username: {{ .username }}
{{- with .username }}
username: {{ . }}
{{- end }}
user_domain_name: {{ .user_domain_name }}
{{- with .user_domain_id }}
user_domain_id: {{ . }}
{{- end }}
{{- with .user_id }}
user_id: {{ . }}
{{- end }}
password: {{ .password }}
{{- with .password }}
password: {{ . }}
{{- end }}
{{- with .domain_id }}
domain_id: {{ . }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,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
Expand Down
Loading