Skip to content

Commit

Permalink
Helm chart support for OpenStack application credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis Holton committed Jul 10, 2024
1 parent 5b4e576 commit 277df65
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 8 deletions.
3 changes: 3 additions & 0 deletions docs/sources/setup/install/helm/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Entries should include a reference to the pull request that introduced the chang
## 6.6.5

- [BUGFIX] Fix querier address in SingleBinary mode
## 6.7.0

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

## 6.6.4

Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
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.0.0
version: 6.6.5
version: 6.7.0
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.6.5](https://img.shields.io/badge/Version-6.6.5-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.

Expand Down
51 changes: 45 additions & 6 deletions production/helm/loki/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -300,22 +300,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 @@ -409,22 +422,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 @@ -493,22 +519,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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 277df65

Please sign in to comment.