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

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
+3 −2
Open

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03a522a
fix(helm): change how the configMap for the gateway is generated
jarmd Oct 22, 2024
dfda1c9
Merge branch 'main' into bug/nginx-conf
jarmd Oct 23, 2024
96b2126
Merge branch 'main' into bug/nginx-conf
jarmd Oct 24, 2024
05dc5b9
Merge branch 'main' into bug/nginx-conf
jarmd Oct 24, 2024
a097000
Merge branch 'main' into bug/nginx-conf
jarmd Nov 7, 2024
616d3fb
Merge branch 'main' into bug/nginx-conf
jarmd Nov 15, 2024
85b7c38
chore(docs): update to CHANGELOG
jarmd Nov 15, 2024
d34c6ff
Merge branch 'main' into bug/nginx-conf
trevorwhitney Nov 15, 2024
a199281
Merge branch 'main' into bug/nginx-conf
trevorwhitney Nov 15, 2024
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
2 changes: 1 addition & 1 deletion production/helm/loki/templates/gateway/configmap-gateway.yaml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down