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.

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

fix(helm): change how the configMap for the gateway is generated #14575

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
1 change: 1 addition & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ 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.)

- [ENHANCEMENT] Expose Topology Spread Constraints in Helm chart templates and default values.
- [BUGFIX] Fix Helm chart for gateway to be able to use custom file configuration without first line being a comment. https://github.com/grafana/loki/pull/14575

## 6.19.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ metadata:
{{- include "loki.gatewayLabels" . | nindent 4 }}
data:
nginx.conf: |
{{- tpl .Values.gateway.nginxConfig.file . | indent 2 }}
{{- tpl .Values.gateway.nginxConfig.file . | nindent 4 }}
{{- end }}
2 changes: 1 addition & 1 deletion production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ gateway:
# -- Config file contents for Nginx. Passed through the `tpl` function to allow templating
# @default -- See values.yaml
file: |
{{- include "loki.nginxFile" . | indent 2 -}}
{{- include "loki.nginxFile" . }}
# -- If running enterprise and using the default enterprise gateway, configs go here.
enterpriseGateway:
# -- Define the amount of instances
Expand Down
Loading