[bitnami/thanos]: Use merge helper (#19119)

This commit is contained in:
Juan Ariza Toledano
2023-09-08 09:45:35 +02:00
committed by GitHub
parent 3ae70c4016
commit 9f4fe77cbf
60 changed files with 98 additions and 98 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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:

View File

@@ -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

View File

@@ -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:

View File

@@ -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:

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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:

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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:

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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