From 9f4fe77cbfcb645d8f38a667997a8c3fbe3f6fef Mon Sep 17 00:00:00 2001 From: Juan Ariza Toledano Date: Fri, 8 Sep 2023 09:45:35 +0200 Subject: [PATCH] [bitnami/thanos]: Use merge helper (#19119) --- bitnami/thanos/Chart.yaml | 34 +++++++++---------- .../templates/bucketweb/deployment.yaml | 2 +- .../thanos/templates/bucketweb/ingress.yaml | 2 +- bitnami/thanos/templates/bucketweb/pdb.yaml | 2 +- .../thanos/templates/bucketweb/service.yaml | 6 ++-- .../templates/bucketweb/serviceaccount.yaml | 2 +- .../templates/bucketweb/servicemonitor.yaml | 2 +- .../templates/compactor/_pod-template.tpl | 2 +- .../templates/compactor/deployment.yaml | 2 +- .../thanos/templates/compactor/ingress.yaml | 2 +- bitnami/thanos/templates/compactor/pvc.yaml | 4 +-- .../thanos/templates/compactor/service.yaml | 6 ++-- .../templates/compactor/serviceaccount.yaml | 2 +- .../templates/compactor/servicemonitor.yaml | 2 +- .../templates/query-frontend/deployment.yaml | 2 +- .../templates/query-frontend/ingress.yaml | 2 +- .../thanos/templates/query-frontend/pdb.yaml | 2 +- .../templates/query-frontend/service.yaml | 6 ++-- .../query-frontend/serviceaccount.yaml | 2 +- .../query-frontend/servicemonitor.yaml | 2 +- .../thanos/templates/query/deployment.yaml | 2 +- .../thanos/templates/query/ingress-grpc.yaml | 2 +- bitnami/thanos/templates/query/ingress.yaml | 2 +- bitnami/thanos/templates/query/pdb.yaml | 2 +- .../query/service-grpc-headless.yaml | 4 +-- .../thanos/templates/query/service-grpc.yaml | 4 +-- .../templates/query/service-headless.yaml | 4 +-- bitnami/thanos/templates/query/service.yaml | 6 ++-- .../templates/query/serviceaccount.yaml | 2 +- .../templates/query/servicemonitor.yaml | 2 +- .../receive-distributor/deployment.yaml | 2 +- .../templates/receive-distributor/pdb.yaml | 2 +- .../receive-distributor/serviceaccount.yaml | 2 +- .../receive-distributor/servicemonitor.yaml | 2 +- bitnami/thanos/templates/receive/ingress.yaml | 2 +- bitnami/thanos/templates/receive/pdb.yaml | 2 +- .../templates/receive/service-headless.yaml | 4 +-- bitnami/thanos/templates/receive/service.yaml | 6 ++-- .../templates/receive/serviceaccount.yaml | 2 +- .../templates/receive/servicemonitor.yaml | 2 +- .../thanos/templates/receive/statefulset.yaml | 2 +- bitnami/thanos/templates/ruler/ingress.yaml | 2 +- bitnami/thanos/templates/ruler/pdb.yaml | 2 +- .../templates/ruler/service-headless.yaml | 4 +-- bitnami/thanos/templates/ruler/service.yaml | 6 ++-- .../templates/ruler/serviceaccount.yaml | 2 +- .../templates/ruler/servicemonitor.yaml | 2 +- .../thanos/templates/ruler/statefulset.yaml | 2 +- bitnami/thanos/templates/serviceaccount.yaml | 2 +- .../templates/storegateway/ingress-grpc.yaml | 2 +- .../templates/storegateway/ingress.yaml | 2 +- .../templates/storegateway/pdb-sharded.yaml | 2 +- .../thanos/templates/storegateway/pdb.yaml | 2 +- .../storegateway/service-headless.yaml | 4 +-- .../storegateway/service-sharded.yaml | 4 +-- .../templates/storegateway/service.yaml | 6 ++-- .../storegateway/serviceaccount.yaml | 2 +- .../storegateway/servicemonitor.yaml | 2 +- .../storegateway/statefulset-sharded.yaml | 2 +- .../templates/storegateway/statefulset.yaml | 2 +- 60 files changed, 98 insertions(+), 98 deletions(-) diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml index fa09daf46f..88a430c187 100644 --- a/bitnami/thanos/Chart.yaml +++ b/bitnami/thanos/Chart.yaml @@ -12,27 +12,27 @@ annotations: apiVersion: v2 appVersion: 0.32.2 dependencies: -- condition: minio.enabled - name: minio - repository: oci://registry-1.docker.io/bitnamicharts - version: 12.x.x -- name: common - repository: oci://registry-1.docker.io/bitnamicharts - tags: - - bitnami-common - version: 2.x.x + - condition: minio.enabled + name: minio + repository: oci://registry-1.docker.io/bitnamicharts + version: 12.x.x + - name: common + repository: oci://registry-1.docker.io/bitnamicharts + tags: + - bitnami-common + version: 2.x.x description: Thanos is a highly available metrics system that can be added on top of existing Prometheus deployments, providing a global query view across all Prometheus installations. home: https://bitnami.com icon: https://bitnami.com/assets/stacks/thanos/img/thanos-stack-220x234.png keywords: -- analytics -- monitoring -- prometheus -- thanos + - analytics + - monitoring + - prometheus + - thanos maintainers: -- name: VMware, Inc. - url: https://github.com/bitnami/charts + - name: VMware, Inc. + url: https://github.com/bitnami/charts name: thanos sources: -- https://github.com/bitnami/charts/tree/main/bitnami/thanos -version: 12.13.2 + - https://github.com/bitnami/charts/tree/main/bitnami/thanos +version: 12.13.3 diff --git a/bitnami/thanos/templates/bucketweb/deployment.yaml b/bitnami/thanos/templates/bucketweb/deployment.yaml index 213cf4637c..097f530e17 100644 --- a/bitnami/thanos/templates/bucketweb/deployment.yaml +++ b/bitnami/thanos/templates/bucketweb/deployment.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.bucketweb.updateStrategy }} strategy: {{- toYaml .Values.bucketweb.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.bucketweb.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: bucketweb diff --git a/bitnami/thanos/templates/bucketweb/ingress.yaml b/bitnami/thanos/templates/bucketweb/ingress.yaml index 803eafc91c..29c6bb6457 100644 --- a/bitnami/thanos/templates/bucketweb/ingress.yaml +++ b/bitnami/thanos/templates/bucketweb/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: bucketweb {{- if or .Values.bucketweb.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.bucketweb.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/bucketweb/pdb.yaml b/bitnami/thanos/templates/bucketweb/pdb.yaml index f2e76fe218..7b6e4073bb 100644 --- a/bitnami/thanos/templates/bucketweb/pdb.yaml +++ b/bitnami/thanos/templates/bucketweb/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.bucketweb.pdb.maxUnavailable }} maxUnavailable: {{ .Values.bucketweb.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.bucketweb.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: bucketweb diff --git a/bitnami/thanos/templates/bucketweb/service.yaml b/bitnami/thanos/templates/bucketweb/service.yaml index 533a121aeb..eb0e4aa40d 100644 --- a/bitnami/thanos/templates/bucketweb/service.yaml +++ b/bitnami/thanos/templates/bucketweb/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-bucketweb namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.bucketweb.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: bucketweb {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.bucketweb.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.bucketweb.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -48,7 +48,7 @@ spec: {{- if .Values.bucketweb.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.bucketweb.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.bucketweb.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: bucketweb {{- end }} diff --git a/bitnami/thanos/templates/bucketweb/serviceaccount.yaml b/bitnami/thanos/templates/bucketweb/serviceaccount.yaml index fdf247b21e..d64bc206df 100644 --- a/bitnami/thanos/templates/bucketweb/serviceaccount.yaml +++ b/bitnami/thanos/templates/bucketweb/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: bucketweb {{- if or .Values.bucketweb.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.bucketweb.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.bucketweb.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.bucketweb.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/bucketweb/servicemonitor.yaml b/bitnami/thanos/templates/bucketweb/servicemonitor.yaml index 1b20ccaac4..10103707d2 100644 --- a/bitnami/thanos/templates/bucketweb/servicemonitor.yaml +++ b/bitnami/thanos/templates/bucketweb/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-bucketweb namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: bucketweb {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/compactor/_pod-template.tpl b/bitnami/thanos/templates/compactor/_pod-template.tpl index c6eb1d98cf..5c2f14942a 100644 --- a/bitnami/thanos/templates/compactor/_pod-template.tpl +++ b/bitnami/thanos/templates/compactor/_pod-template.tpl @@ -10,7 +10,7 @@ Compactor pod template. Shared between Cronjob and deployment */}} {{- define "thanos.compactor.podTemplate" -}} metadata: - {{- $podLabels := merge .Values.compactor.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.podLabels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor annotations: diff --git a/bitnami/thanos/templates/compactor/deployment.yaml b/bitnami/thanos/templates/compactor/deployment.yaml index 940a5284c6..9ace718fd5 100644 --- a/bitnami/thanos/templates/compactor/deployment.yaml +++ b/bitnami/thanos/templates/compactor/deployment.yaml @@ -19,7 +19,7 @@ spec: {{- if .Values.compactor.updateStrategy }} strategy: {{- toYaml .Values.compactor.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.compactor.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: compactor diff --git a/bitnami/thanos/templates/compactor/ingress.yaml b/bitnami/thanos/templates/compactor/ingress.yaml index 88c084aec5..bb4b0d91ec 100644 --- a/bitnami/thanos/templates/compactor/ingress.yaml +++ b/bitnami/thanos/templates/compactor/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- if or .Values.compactor.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.compactor.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/compactor/pvc.yaml b/bitnami/thanos/templates/compactor/pvc.yaml index acbdfced14..9e41c87286 100644 --- a/bitnami/thanos/templates/compactor/pvc.yaml +++ b/bitnami/thanos/templates/compactor/pvc.yaml @@ -9,11 +9,11 @@ apiVersion: v1 metadata: name: {{ include "common.names.fullname" . }}-compactor namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.compactor.persistence.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.persistence.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- if or .Values.compactor.persistence.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.compactor.persistence.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.persistence.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/compactor/service.yaml b/bitnami/thanos/templates/compactor/service.yaml index 88197865db..f2dab76f33 100644 --- a/bitnami/thanos/templates/compactor/service.yaml +++ b/bitnami/thanos/templates/compactor/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-compactor namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.compactor.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.compactor.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.compactor.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -48,7 +48,7 @@ spec: {{- if .Values.compactor.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.compactor.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.compactor.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- end }} diff --git a/bitnami/thanos/templates/compactor/serviceaccount.yaml b/bitnami/thanos/templates/compactor/serviceaccount.yaml index d4ea65dc82..c0665c9fa9 100644 --- a/bitnami/thanos/templates/compactor/serviceaccount.yaml +++ b/bitnami/thanos/templates/compactor/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- if or .Values.compactor.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.compactor.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.compactor.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.compactor.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/compactor/servicemonitor.yaml b/bitnami/thanos/templates/compactor/servicemonitor.yaml index d7b8ef1b3e..f6edf21a73 100644 --- a/bitnami/thanos/templates/compactor/servicemonitor.yaml +++ b/bitnami/thanos/templates/compactor/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-compactor namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: compactor {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/query-frontend/deployment.yaml b/bitnami/thanos/templates/query-frontend/deployment.yaml index 4ca2c8e0d4..5b85ac7ca2 100644 --- a/bitnami/thanos/templates/query-frontend/deployment.yaml +++ b/bitnami/thanos/templates/query-frontend/deployment.yaml @@ -22,7 +22,7 @@ spec: {{- if .Values.queryFrontend.updateStrategy }} strategy: {{- toYaml .Values.queryFrontend.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.queryFrontend.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: query-frontend diff --git a/bitnami/thanos/templates/query-frontend/ingress.yaml b/bitnami/thanos/templates/query-frontend/ingress.yaml index 55e6fe4f6d..3d7cd2623a 100644 --- a/bitnami/thanos/templates/query-frontend/ingress.yaml +++ b/bitnami/thanos/templates/query-frontend/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query-frontend {{- if or .Values.queryFrontend.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.queryFrontend.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/query-frontend/pdb.yaml b/bitnami/thanos/templates/query-frontend/pdb.yaml index 6d002915ee..e171051e6c 100644 --- a/bitnami/thanos/templates/query-frontend/pdb.yaml +++ b/bitnami/thanos/templates/query-frontend/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.queryFrontend.pdb.maxUnavailable }} maxUnavailable: {{ .Values.queryFrontend.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.queryFrontend.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: query-frontend diff --git a/bitnami/thanos/templates/query-frontend/service.yaml b/bitnami/thanos/templates/query-frontend/service.yaml index 9964eb86ff..54e0509111 100644 --- a/bitnami/thanos/templates/query-frontend/service.yaml +++ b/bitnami/thanos/templates/query-frontend/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-query-frontend namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.queryFrontend.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query-frontend {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.queryFrontend.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.queryFrontend.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -48,7 +48,7 @@ spec: {{- if .Values.queryFrontend.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.queryFrontend.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query-frontend {{- end }} diff --git a/bitnami/thanos/templates/query-frontend/serviceaccount.yaml b/bitnami/thanos/templates/query-frontend/serviceaccount.yaml index 55e4481fce..b1ae505209 100644 --- a/bitnami/thanos/templates/query-frontend/serviceaccount.yaml +++ b/bitnami/thanos/templates/query-frontend/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query-frontend {{- if or .Values.queryFrontend.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.queryFrontend.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.queryFrontend.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/query-frontend/servicemonitor.yaml b/bitnami/thanos/templates/query-frontend/servicemonitor.yaml index 2878f613bf..45e85117ea 100644 --- a/bitnami/thanos/templates/query-frontend/servicemonitor.yaml +++ b/bitnami/thanos/templates/query-frontend/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-query-frontend namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query-frontend {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/query/deployment.yaml b/bitnami/thanos/templates/query/deployment.yaml index 4d28acb9ad..c9fa6dc419 100644 --- a/bitnami/thanos/templates/query/deployment.yaml +++ b/bitnami/thanos/templates/query/deployment.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.query.updateStrategy }} strategy: {{- toYaml .Values.query.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: query diff --git a/bitnami/thanos/templates/query/ingress-grpc.yaml b/bitnami/thanos/templates/query/ingress-grpc.yaml index c29bee3a40..e73c278725 100644 --- a/bitnami/thanos/templates/query/ingress-grpc.yaml +++ b/bitnami/thanos/templates/query/ingress-grpc.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if or .Values.query.ingress.grpc.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.query.ingress.grpc.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.grpc.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/query/ingress.yaml b/bitnami/thanos/templates/query/ingress.yaml index a7aec9af8b..bfc2909a34 100644 --- a/bitnami/thanos/templates/query/ingress.yaml +++ b/bitnami/thanos/templates/query/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if or .Values.query.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.query.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/query/pdb.yaml b/bitnami/thanos/templates/query/pdb.yaml index f1152e3eec..9e357f057c 100644 --- a/bitnami/thanos/templates/query/pdb.yaml +++ b/bitnami/thanos/templates/query/pdb.yaml @@ -25,7 +25,7 @@ spec: {{- if $query.pdb.maxUnavailable }} maxUnavailable: {{ $query.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge $query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $query.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: query diff --git a/bitnami/thanos/templates/query/service-grpc-headless.yaml b/bitnami/thanos/templates/query/service-grpc-headless.yaml index 9605e5bda4..0eae624927 100644 --- a/bitnami/thanos/templates/query/service-grpc-headless.yaml +++ b/bitnami/thanos/templates/query/service-grpc-headless.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if or .Values.query.serviceGrpc.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.query.serviceGrpc.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.serviceGrpc.headless.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -30,7 +30,7 @@ spec: {{- if .Values.query.serviceGrpc.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.query.serviceGrpc.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- end }} diff --git a/bitnami/thanos/templates/query/service-grpc.yaml b/bitnami/thanos/templates/query/service-grpc.yaml index 53e79d56f5..fe01c4e643 100644 --- a/bitnami/thanos/templates/query/service-grpc.yaml +++ b/bitnami/thanos/templates/query/service-grpc.yaml @@ -13,7 +13,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if or $query.serviceGrpc.annotations .Values.commonAnnotations }} - {{- $annotations := merge $query.serviceGrpc.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list $query.serviceGrpc.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -47,7 +47,7 @@ spec: {{- if $query.serviceGrpc.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" $query.serviceGrpc.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge $query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $query.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- end }} diff --git a/bitnami/thanos/templates/query/service-headless.yaml b/bitnami/thanos/templates/query/service-headless.yaml index 81dacb3b2f..84b4cb3c2d 100644 --- a/bitnami/thanos/templates/query/service-headless.yaml +++ b/bitnami/thanos/templates/query/service-headless.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/component: query {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.query.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.query.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -31,7 +31,7 @@ spec: {{- if .Values.query.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.query.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- end }} diff --git a/bitnami/thanos/templates/query/service.yaml b/bitnami/thanos/templates/query/service.yaml index 39e36f7cb3..634284d1eb 100644 --- a/bitnami/thanos/templates/query/service.yaml +++ b/bitnami/thanos/templates/query/service.yaml @@ -10,12 +10,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-query namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge $query.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list $query.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or $query.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge $query.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list $query.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -49,7 +49,7 @@ spec: {{- if $query.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" $query.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge $query.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $query.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- end }} diff --git a/bitnami/thanos/templates/query/serviceaccount.yaml b/bitnami/thanos/templates/query/serviceaccount.yaml index 1c636029a8..03a7673c8f 100644 --- a/bitnami/thanos/templates/query/serviceaccount.yaml +++ b/bitnami/thanos/templates/query/serviceaccount.yaml @@ -13,7 +13,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if or .Values.query.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.query.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.query.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/query/servicemonitor.yaml b/bitnami/thanos/templates/query/servicemonitor.yaml index 3859b72732..adc8c5ef60 100644 --- a/bitnami/thanos/templates/query/servicemonitor.yaml +++ b/bitnami/thanos/templates/query/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-query namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: query {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/receive-distributor/deployment.yaml b/bitnami/thanos/templates/receive-distributor/deployment.yaml index e5c59ad993..680c5e676e 100644 --- a/bitnami/thanos/templates/receive-distributor/deployment.yaml +++ b/bitnami/thanos/templates/receive-distributor/deployment.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.receiveDistributor.updateStrategy }} strategy: {{- toYaml .Values.receiveDistributor.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.receiveDistributor.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receiveDistributor.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: receive-distributor diff --git a/bitnami/thanos/templates/receive-distributor/pdb.yaml b/bitnami/thanos/templates/receive-distributor/pdb.yaml index 02b7f3ef3f..d725ac2a93 100644 --- a/bitnami/thanos/templates/receive-distributor/pdb.yaml +++ b/bitnami/thanos/templates/receive-distributor/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.receiveDistributor.pdb.maxUnavailable }} maxUnavailable: {{ .Values.receiveDistributor.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.receiveDistributor.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receiveDistributor.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: receive-distributor diff --git a/bitnami/thanos/templates/receive-distributor/serviceaccount.yaml b/bitnami/thanos/templates/receive-distributor/serviceaccount.yaml index 250ed68ee9..fd9e29a9e3 100644 --- a/bitnami/thanos/templates/receive-distributor/serviceaccount.yaml +++ b/bitnami/thanos/templates/receive-distributor/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive-distributor {{- if or .Values.receiveDistributor.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.receiveDistributor.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.receiveDistributor.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.receiveDistributor.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/receive-distributor/servicemonitor.yaml b/bitnami/thanos/templates/receive-distributor/servicemonitor.yaml index 1f0ccc25e9..e3b056817d 100644 --- a/bitnami/thanos/templates/receive-distributor/servicemonitor.yaml +++ b/bitnami/thanos/templates/receive-distributor/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-receive-distributor namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive-distributor {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/receive/ingress.yaml b/bitnami/thanos/templates/receive/ingress.yaml index b554e47086..97d6274a3c 100644 --- a/bitnami/thanos/templates/receive/ingress.yaml +++ b/bitnami/thanos/templates/receive/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive {{- if or .Values.receive.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.receive.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/receive/pdb.yaml b/bitnami/thanos/templates/receive/pdb.yaml index 12a2426502..d61a1aacfd 100644 --- a/bitnami/thanos/templates/receive/pdb.yaml +++ b/bitnami/thanos/templates/receive/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.receive.pdb.maxUnavailable }} maxUnavailable: {{ .Values.receive.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.receive.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: receive diff --git a/bitnami/thanos/templates/receive/service-headless.yaml b/bitnami/thanos/templates/receive/service-headless.yaml index 5ab29b5414..f2efc9aa47 100644 --- a/bitnami/thanos/templates/receive/service-headless.yaml +++ b/bitnami/thanos/templates/receive/service-headless.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/component: receive {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.receive.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.receive.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -28,7 +28,7 @@ spec: targetPort: grpc protocol: TCP name: grpc - {{- $podLabels := merge .Values.receive.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive {{- end }} diff --git a/bitnami/thanos/templates/receive/service.yaml b/bitnami/thanos/templates/receive/service.yaml index 4524169836..c71606ece2 100644 --- a/bitnami/thanos/templates/receive/service.yaml +++ b/bitnami/thanos/templates/receive/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-receive namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.receive.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.receive.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.receive.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -66,7 +66,7 @@ spec: {{- if .Values.receive.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.receive.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.receive.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} {{- if eq .Values.receive.mode "dual-mode" }} app.kubernetes.io/component: receive-distributor diff --git a/bitnami/thanos/templates/receive/serviceaccount.yaml b/bitnami/thanos/templates/receive/serviceaccount.yaml index ce58700fe9..245ceb04d0 100644 --- a/bitnami/thanos/templates/receive/serviceaccount.yaml +++ b/bitnami/thanos/templates/receive/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive {{- if or .Values.receive.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.receive.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.receive.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/receive/servicemonitor.yaml b/bitnami/thanos/templates/receive/servicemonitor.yaml index 88fbc876e7..6166fd1393 100644 --- a/bitnami/thanos/templates/receive/servicemonitor.yaml +++ b/bitnami/thanos/templates/receive/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-receive namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: receive {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/receive/statefulset.yaml b/bitnami/thanos/templates/receive/statefulset.yaml index b6ae2dd3e9..438831a4a6 100644 --- a/bitnami/thanos/templates/receive/statefulset.yaml +++ b/bitnami/thanos/templates/receive/statefulset.yaml @@ -26,7 +26,7 @@ spec: {{- if .Values.receive.updateStrategy }} updateStrategy: {{- toYaml .Values.receive.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.receive.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.receive.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: receive diff --git a/bitnami/thanos/templates/ruler/ingress.yaml b/bitnami/thanos/templates/ruler/ingress.yaml index 310e65ae4b..f302561d7c 100644 --- a/bitnami/thanos/templates/ruler/ingress.yaml +++ b/bitnami/thanos/templates/ruler/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- if or .Values.ruler.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.ruler.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/ruler/pdb.yaml b/bitnami/thanos/templates/ruler/pdb.yaml index 0d98bce90f..75d05c383b 100644 --- a/bitnami/thanos/templates/ruler/pdb.yaml +++ b/bitnami/thanos/templates/ruler/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.ruler.pdb.maxUnavailable }} maxUnavailable: {{ .Values.ruler.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.ruler.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: ruler diff --git a/bitnami/thanos/templates/ruler/service-headless.yaml b/bitnami/thanos/templates/ruler/service-headless.yaml index c7fb477c75..a7787227ad 100644 --- a/bitnami/thanos/templates/ruler/service-headless.yaml +++ b/bitnami/thanos/templates/ruler/service-headless.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/component: ruler {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.ruler.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.ruler.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -28,7 +28,7 @@ spec: targetPort: grpc protocol: TCP name: grpc - {{- $podLabels := merge .Values.ruler.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- end }} diff --git a/bitnami/thanos/templates/ruler/service.yaml b/bitnami/thanos/templates/ruler/service.yaml index 10514ad7c5..1f76412954 100644 --- a/bitnami/thanos/templates/ruler/service.yaml +++ b/bitnami/thanos/templates/ruler/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-ruler namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.ruler.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.ruler.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.ruler.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -57,7 +57,7 @@ spec: {{- if .Values.ruler.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.ruler.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.ruler.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- end }} diff --git a/bitnami/thanos/templates/ruler/serviceaccount.yaml b/bitnami/thanos/templates/ruler/serviceaccount.yaml index 902960c8cd..dfaaefdafc 100644 --- a/bitnami/thanos/templates/ruler/serviceaccount.yaml +++ b/bitnami/thanos/templates/ruler/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- if or .Values.ruler.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.ruler.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.ruler.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/ruler/servicemonitor.yaml b/bitnami/thanos/templates/ruler/servicemonitor.yaml index fc814fe26a..ee494b872c 100644 --- a/bitnami/thanos/templates/ruler/servicemonitor.yaml +++ b/bitnami/thanos/templates/ruler/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-ruler namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: ruler {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/ruler/statefulset.yaml b/bitnami/thanos/templates/ruler/statefulset.yaml index 40cd96006a..b11dea37b3 100644 --- a/bitnami/thanos/templates/ruler/statefulset.yaml +++ b/bitnami/thanos/templates/ruler/statefulset.yaml @@ -24,7 +24,7 @@ spec: {{- if .Values.ruler.updateStrategy }} updateStrategy: {{- toYaml .Values.ruler.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.ruler.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ruler.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: ruler diff --git a/bitnami/thanos/templates/serviceaccount.yaml b/bitnami/thanos/templates/serviceaccount.yaml index cc3fb5c95c..bf5abde5dd 100644 --- a/bitnami/thanos/templates/serviceaccount.yaml +++ b/bitnami/thanos/templates/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/storegateway/ingress-grpc.yaml b/bitnami/thanos/templates/storegateway/ingress-grpc.yaml index 22c4727d91..43bd5d6ed5 100644 --- a/bitnami/thanos/templates/storegateway/ingress-grpc.yaml +++ b/bitnami/thanos/templates/storegateway/ingress-grpc.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- if or .Values.storegateway.ingress.grpc.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.storegateway.ingress.grpc.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.ingress.grpc.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/storegateway/ingress.yaml b/bitnami/thanos/templates/storegateway/ingress.yaml index 1021b7afce..9cd5d9154b 100644 --- a/bitnami/thanos/templates/storegateway/ingress.yaml +++ b/bitnami/thanos/templates/storegateway/ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- if or .Values.storegateway.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.storegateway.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.ingress.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: diff --git a/bitnami/thanos/templates/storegateway/pdb-sharded.yaml b/bitnami/thanos/templates/storegateway/pdb-sharded.yaml index 2d6345a3f3..2babf84e9f 100644 --- a/bitnami/thanos/templates/storegateway/pdb-sharded.yaml +++ b/bitnami/thanos/templates/storegateway/pdb-sharded.yaml @@ -31,7 +31,7 @@ spec: {{- if $.Values.storegateway.pdb.maxUnavailable }} maxUnavailable: {{ $.Values.storegateway.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge $.Values.storegateway.podLabels $.Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $.Values.storegateway.podLabels $.Values.commonLabels ) "context" $ ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: storegateway diff --git a/bitnami/thanos/templates/storegateway/pdb.yaml b/bitnami/thanos/templates/storegateway/pdb.yaml index 28236556c7..984cf7f026 100644 --- a/bitnami/thanos/templates/storegateway/pdb.yaml +++ b/bitnami/thanos/templates/storegateway/pdb.yaml @@ -21,7 +21,7 @@ spec: {{- if .Values.storegateway.pdb.maxUnavailable }} maxUnavailable: {{ .Values.storegateway.pdb.maxUnavailable }} {{- end }} - {{- $podLabels := merge .Values.storegateway.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: storegateway diff --git a/bitnami/thanos/templates/storegateway/service-headless.yaml b/bitnami/thanos/templates/storegateway/service-headless.yaml index 4c070fa54a..02c249a639 100644 --- a/bitnami/thanos/templates/storegateway/service-headless.yaml +++ b/bitnami/thanos/templates/storegateway/service-headless.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/component: storegateway {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.storegateway.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.storegateway.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -28,7 +28,7 @@ spec: targetPort: grpc protocol: TCP name: grpc - {{- $podLabels := merge .Values.storegateway.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- end }} diff --git a/bitnami/thanos/templates/storegateway/service-sharded.yaml b/bitnami/thanos/templates/storegateway/service-sharded.yaml index 35280c4127..fe05dedd4a 100644 --- a/bitnami/thanos/templates/storegateway/service-sharded.yaml +++ b/bitnami/thanos/templates/storegateway/service-sharded.yaml @@ -26,7 +26,7 @@ metadata: prometheus-operator/monitor: 'true' {{- end }} {{- if or $.Values.storegateway.service.annotations $.Values.commonAnnotations }} - {{- $annotations := merge $.Values.storegateway.service.annotations $.Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list $.Values.storegateway.service.annotations $.Values.commonAnnotations ) "context" $ ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -69,7 +69,7 @@ spec: {{- if $.Values.storegateway.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" $.Values.storegateway.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge $.Values.storegateway.podLabels $.Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $.Values.storegateway.podLabels $.Values.commonLabels ) "context" $ ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway shard: {{ $index | quote }} diff --git a/bitnami/thanos/templates/storegateway/service.yaml b/bitnami/thanos/templates/storegateway/service.yaml index 2175f0ce54..dbf710d7c5 100644 --- a/bitnami/thanos/templates/storegateway/service.yaml +++ b/bitnami/thanos/templates/storegateway/service.yaml @@ -9,12 +9,12 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-storegateway namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.storegateway.service.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.service.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- include "thanos.servicemonitor.matchLabels" . | nindent 4 -}} {{- if or .Values.storegateway.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.storegateway.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -57,7 +57,7 @@ spec: {{- if .Values.storegateway.service.labelSelectorsOverride }} {{- include "common.tplvalues.render" (dict "value" .Values.storegateway.service.labelSelectorsOverride "context" $) | nindent 4 }} {{- else }} - {{- $podLabels := merge .Values.storegateway.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.podLabels .Values.commonLabels ) "context" . ) }} {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- end }} diff --git a/bitnami/thanos/templates/storegateway/serviceaccount.yaml b/bitnami/thanos/templates/storegateway/serviceaccount.yaml index b1c03a2587..d8e66c3057 100644 --- a/bitnami/thanos/templates/storegateway/serviceaccount.yaml +++ b/bitnami/thanos/templates/storegateway/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- if or .Values.storegateway.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.storegateway.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.storegateway.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/thanos/templates/storegateway/servicemonitor.yaml b/bitnami/thanos/templates/storegateway/servicemonitor.yaml index f5616b899e..f50de7f356 100644 --- a/bitnami/thanos/templates/storegateway/servicemonitor.yaml +++ b/bitnami/thanos/templates/storegateway/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }}-storegateway namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: storegateway {{- if .Values.commonAnnotations }} diff --git a/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml b/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml index 950e3061a0..9f0e09b776 100644 --- a/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml +++ b/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml @@ -36,7 +36,7 @@ spec: {{- if $.Values.storegateway.updateStrategy }} updateStrategy: {{- toYaml $.Values.storegateway.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge $.Values.storegateway.podLabels $.Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list $.Values.storegateway.podLabels $.Values.commonLabels ) "context" $ ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: storegateway diff --git a/bitnami/thanos/templates/storegateway/statefulset.yaml b/bitnami/thanos/templates/storegateway/statefulset.yaml index 3fd3582a01..326e69dbe4 100644 --- a/bitnami/thanos/templates/storegateway/statefulset.yaml +++ b/bitnami/thanos/templates/storegateway/statefulset.yaml @@ -23,7 +23,7 @@ spec: {{- if .Values.storegateway.updateStrategy }} updateStrategy: {{- toYaml .Values.storegateway.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.storegateway.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.storegateway.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: storegateway