Skip to content

Commit 4fe20a7

Browse files
fix: in helm chart fix indentation in nginx gateway config template handling (#18167)
Signed-off-by: Jim Croft <[email protected]>
1 parent a091428 commit 4fe20a7

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

production/helm/loki/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Entries should include a reference to the pull request that introduced the chang
1717
- [FEATURE] Added pdb for pattern ingester [#17058](https://github.com/grafana/loki/pull/17058)
1818
- [BUGFIX] Ensure ui.enabled=true is set in loki ConfigMap when loki.ui.enabled=true is set in values.yaml to actually enable the UI [#17562](https://github.com/grafana/loki/pull/17562)
1919
- [FEATURE] Added trafficDistribution to service-distributor for multi-az purpose
20+
- [BUGFIX] Fix custom gateway nginx config rendering error [#18167](https://github.com/grafana/loki/pull/18167)
2021

2122
## 6.30.1
2223

production/helm/loki/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ Create the service endpoint including port for MinIO.
747747
{{- end -}}
748748

749749
{{/* Snippet for the nginx file used by gateway */}}
750-
{{- define "loki.nginxFile" }}
750+
{{- define "loki.nginxFile" -}}
751751
worker_processes 5; ## Default: 1
752752
error_log /dev/stderr;
753753
pid /tmp/nginx.pid;

production/helm/loki/templates/gateway/configmap-gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ metadata:
88
{{- include "loki.gatewayLabels" . | nindent 4 }}
99
data:
1010
nginx.conf: |
11-
{{- tpl .Values.gateway.nginxConfig.file . | indent 2 }}
11+
{{- tpl .Values.gateway.nginxConfig.file . | nindent 4 }}
1212
{{- end }}

production/helm/loki/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ gateway:
11901190
# -- Config file contents for Nginx. Passed through the `tpl` function to allow templating
11911191
# @default -- See values.yaml
11921192
file: |
1193-
{{- include "loki.nginxFile" . | indent 2 -}}
1193+
{{- include "loki.nginxFile" . -}}
11941194
# -- If running enterprise and using the default enterprise gateway, configs go here.
11951195
enterpriseGateway:
11961196
# -- Define the amount of instances

0 commit comments

Comments
 (0)