Skip to content

fix(helm): yaml templates incorrectly annotated #15207

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

Merged
merged 4 commits into from
Dec 4, 2024
Merged

fix(helm): yaml templates incorrectly annotated #15207

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85cfa19
fix: helm chart template yaml files
mericks Dec 2, 2024
a816fd2
Revert "fix: helm chart template yaml files"
mericks Dec 4, 2024
52e7070
fix: statefulset-companctor tpl -> toYaml
mericks Dec 4, 2024
adcc0c8
Merge branch 'main' into loki-15206-helm-chart-fix-misconfigured-yaml…
mericks Dec 4, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "fix: helm chart template yaml files" 
This reverts commit 85cfa19.
  • Loading branch information
@mericks
mericks committed Dec 4, 2024
commit a816fd229fb9a3b6498cfa25581a7b6ad0040014
2 changes: 1 addition & 1 deletion production/helm/loki/templates/backend/statefulset-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ spec:
{{- end }}
{{- with .Values.backend.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.backend.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/compactor/statefulset-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.Version }}
{{- with .Values.compactor.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- end }}
serviceAccountName: {{ include "loki.serviceAccountName" . }}
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
{{- end }}
{{- with .Values.gateway.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.gateway.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/read/deployment-read.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ spec:
{{- end }}
{{- with .Values.read.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.read.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/read/statefulset-read.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:
{{- end }}
{{- with .Values.read.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.read.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/single-binary/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
{{- end }}
{{- with .Values.singleBinary.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.singleBinary.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/table-manager/deployment-table-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:
{{- end }}
{{- with .Values.tableManager.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.tableManager.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/write/statefulset-write.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
{{- end }}
{{- with .Values.write.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | nindent 8 }}
{{- end }}
{{- with .Values.write.nodeSelector }}
nodeSelector:
Expand Down