From 03a522ac84d782a4d0b1e76ce2295abdbbbee9c8 Mon Sep 17 00:00:00 2001 From: Jan Primdahl Madsen Date: Tue, 22 Oct 2024 15:14:36 +0200 Subject: [PATCH 1/2] fix(helm): change how the configMap for the gateway is generated --- production/helm/loki/templates/gateway/configmap-gateway.yaml | 2 +- production/helm/loki/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/templates/gateway/configmap-gateway.yaml b/production/helm/loki/templates/gateway/configmap-gateway.yaml index 1c981a73a5b86..5f8d2b703f0d3 100644 --- a/production/helm/loki/templates/gateway/configmap-gateway.yaml +++ b/production/helm/loki/templates/gateway/configmap-gateway.yaml @@ -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 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 8ae5dc8e57a54..7ecf3f2ad2aac 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1095,7 +1095,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 From 85b7c3868f798d6d808ec47d3dc09ca209445ae7 Mon Sep 17 00:00:00 2001 From: Jan Primdahl Madsen Date: Fri, 15 Nov 2024 07:59:32 +0100 Subject: [PATCH 2/2] chore(docs): update to CHANGELOG --- production/helm/loki/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 5f477f978c2ec..2abd453873623 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -14,6 +14,7 @@ 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.) - [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