[bitnami/grafana-tempo: Use merge helper]: (#19047)

This commit is contained in:
Juan Ariza Toledano
2023-09-11 15:53:24 +02:00
committed by GitHub
parent 8b30cd2712
commit f460a53769
26 changed files with 38 additions and 38 deletions

View File

@@ -4,6 +4,6 @@ dependencies:
version: 6.6.0
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.9.1
digest: sha256:39c44c349ec5e5ef62d533a927c0b64746e2ea53e0c4b8aea3bd52c0e34818b5
generated: "2023-08-31T05:38:40.644134736Z"
version: 2.10.0
digest: sha256:317713af7e60054c878e86b0ee4e964d9ded4bbc62055a5500cd36565518300f
generated: "2023-09-05T11:32:55.595219+02:00"

View File

@@ -38,5 +38,5 @@ maintainers:
url: https://github.com/bitnami/charts
name: grafana-tempo
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo
version: 2.4.2
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo
version: 2.4.3

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.commonAnnotations .Values.compactor.service.annotations }}
{{- $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.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.compactor.service.extraPorts "context" $) | 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: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: compactor
{{- end }}

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.compactor.fullname" . }}
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

@@ -18,7 +18,7 @@ spec:
{{- if .Values.distributor.updateStrategy }}
strategy: {{- toYaml .Values.distributor.updateStrategy | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.distributor.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.distributor.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: distributor

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: distributor
{{- if or .Values.commonAnnotations .Values.distributor.service.annotations }}
{{- $annotations := merge .Values.distributor.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.distributor.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -109,6 +109,6 @@ spec:
{{- if .Values.distributor.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.distributor.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.distributor.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.distributor.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: distributor

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.distributor.fullname" . }}
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: distributor
{{- if .Values.commonAnnotations }}

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: tempo
{{- if or .Values.commonAnnotations .Values.tempo.gossipRing.service.annotations }}
{{- $annotations := merge .Values.tempo.gossipRing.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.tempo.gossipRing.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: ingester
{{- if or .Values.commonAnnotations .Values.ingester.service.annotations }}
{{- $annotations := merge .Values.ingester.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingester.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -56,6 +56,6 @@ spec:
{{- if .Values.ingester.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingester.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.ingester.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingester.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: ingester

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.ingester.fullname" . }}
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: ingester
{{- if .Values.commonAnnotations }}

View File

@@ -18,7 +18,7 @@ spec:
{{- if .Values.ingester.updateStrategy }}
updateStrategy: {{- toYaml .Values.ingester.updateStrategy | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.ingester.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingester.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: ingester
@@ -197,7 +197,7 @@ spec:
- metadata:
name: data
{{- if or .Values.ingester.persistence.annotations .Values.commonAnnotations }}
{{- $claimAnnotations := merge .Values.ingester.persistence.annotations .Values.commonAnnotations }}
{{- $claimAnnotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingester.persistence.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.commonLabels }}

View File

@@ -18,7 +18,7 @@ spec:
{{- if .Values.metricsGenerator.updateStrategy }}
strategy: {{- toYaml .Values.metricsGenerator.updateStrategy | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.metricsGenerator.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metricsGenerator.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: metrics-generator

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: metrics-generator
{{- if or .Values.commonAnnotations .Values.metricsGenerator.service.annotations }}
{{- $annotations := merge .Values.metricsGenerator.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.metricsGenerator.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -48,6 +48,6 @@ spec:
{{- else if eq .Values.metricsGenerator.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- $podLabels := merge .Values.metricsGenerator.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metricsGenerator.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: metrics-generator

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.metrics-generator.fullname" . }}
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: metrics-generator
{{- if .Values.commonAnnotations }}

View File

@@ -18,7 +18,7 @@ spec:
{{- if .Values.querier.updateStrategy }}
strategy: {{- toYaml .Values.querier.updateStrategy | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.querier.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.querier.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: querier

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: querier
{{- if or .Values.commonAnnotations .Values.querier.service.annotations }}
{{- $annotations := merge .Values.querier.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.querier.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -56,6 +56,6 @@ spec:
{{- if .Values.querier.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.querier.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.querier.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.querier.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: querier

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.querier.fullname" . }}
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: querier
{{- if .Values.commonAnnotations }}

View File

@@ -18,7 +18,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

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: query-frontend
{{- if or .Values.commonAnnotations .Values.queryFrontend.service.headless.annotations }}
{{- $annotations := merge .Values.queryFrontend.service.headless.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryFrontend.service.headless.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@@ -31,6 +31,6 @@ spec:
{{- if .Values.queryFrontend.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.service.extraPorts "context" $) | 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: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: query-frontend

View File

@@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: query-frontend
{{- if or .Values.commonAnnotations .Values.queryFrontend.service.annotations }}
{{- $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:
@@ -57,6 +57,6 @@ spec:
{{- if .Values.queryFrontend.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.service.extraPorts "context" $) | 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: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: query-frontend

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.query-frontend.fullname" . }}
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

@@ -12,7 +12,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: tempo
{{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }}
{{- $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

@@ -19,7 +19,7 @@ spec:
{{- if .Values.vulture.updateStrategy }}
strategy: {{- toYaml .Values.vulture.updateStrategy | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.vulture.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.vulture.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: vulture

View File

@@ -12,7 +12,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: vulture
{{- if or .Values.commonAnnotations .Values.vulture.service.annotations }}
{{- $annotations := merge .Values.vulture.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.vulture.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.vulture.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.vulture.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.vulture.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.vulture.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: vulture
{{- end }}

View File

@@ -9,7 +9,7 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-tempo.vulture.fullname" . }}
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: vulture
{{- if .Values.commonAnnotations }}