Skip to content

Commit

Permalink
fix(helm): inadvertent accumulation of podLabels using merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@schahal
schahal committed Mar 11, 2025
1 parent c515a4e commit 4ea360a
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion production/helm/loki/templates/admin-api/deployment-admin-api.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
metadata:
labels:
{{- include "enterprise-logs.adminApiLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.adminApi.labels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.adminApi.labels }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
app.kubernetes.io/part-of: memberlist
Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki/templates/backend/statefulset-backend.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/part-of: memberlist
{{- if or (not (empty .Values.loki.annotations)) (not (empty .Values.backend.annotations))}}
annotations:
{{- with merge .Values.loki.annotations .Values.backend.annotations }}
{{- with merge (deepCopy .Values.loki.annotations) .Values.backend.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -53,7 +53,7 @@ spec:
{{- end }}
labels:
{{- include "loki.backendLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.backend.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.backend.podLabels }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
app.kubernetes.io/part-of: memberlist
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
labels:
{{- include "loki.bloomBuilderLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.bloomBuilder.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.bloomBuilder.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
labels:
{{- include "loki.bloomGatewayLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.bloomGateway.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.bloomGateway.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
labels:
{{- include "loki.bloomPlannerLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.bloomPlanner.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.bloomPlanner.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/compactor/statefulset-compactor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
labels:
{{- include "loki.compactorLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.compactor.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.compactor.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/distributor/deployment-distributor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
labels:
{{- include "loki.distributorLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.distributor.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.distributor.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
{{- end }}
labels:
{{- include "loki.indexGatewayLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.indexGateway.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.indexGateway.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.indexGateway.joinMemberlist }}
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-a
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with merge .Values.loki.podLabels .Values.ingester.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.ingester.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-b
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with merge .Values.ingester.podLabels .Values.loki.podLabels }}
{{- with merge (deepCopy .Values.ingester.podLabels) .Values.loki.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-c
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with merge .Values.ingester.podLabels .Values.loki.podLabels }}
{{- with merge (deepCopy .Values.ingester.podLabels) .Values.loki.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ingester/statefulset-ingester.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
labels:
{{- include "loki.ingesterLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.ingester.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.ingester.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/overrides-exporter/deployment-overrides-exporter.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
labels:
{{- include "loki.overridesExporterLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.overridesExporter.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.overridesExporter.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
labels:
{{- include "loki.patternIngesterLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.patternIngester.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.patternIngester.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/querier/deployment-querier.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
labels:
{{- include "loki.querierLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.querier.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.querier.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
labels:
{{- include "loki.queryFrontendLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.queryFrontend.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.queryFrontend.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
{{- end }}
labels:
{{- include "loki.querySchedulerLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.queryScheduler.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.queryScheduler.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
app.kubernetes.io/part-of: memberlist
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/read/statefulset-read.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
labels:
app.kubernetes.io/part-of: memberlist
{{- include "loki.readLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.read.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.read.podLabels }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ruler/statefulset-ruler.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
labels:
{{- include "loki.rulerLabels" . | nindent 8 }}
app.kubernetes.io/part-of: memberlist
{{- with merge .Values.loki.podLabels .Values.ruler.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.ruler.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/write/statefulset-write.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
{{- end }}
labels:
{{- include "loki.writeLabels" . | nindent 8 }}
{{- with merge .Values.loki.podLabels .Values.write.podLabels }}
{{- with merge (deepCopy .Values.loki.podLabels) .Values.write.podLabels }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
app.kubernetes.io/part-of: memberlist
Expand Down

0 comments on commit 4ea360a

Please sign in to comment.