diff --git a/thanos/charts/templates/ruler.yaml b/thanos/charts/templates/ruler.yaml index aeeac49c..4db6858f 100644 --- a/thanos/charts/templates/ruler.yaml +++ b/thanos/charts/templates/ruler.yaml @@ -38,20 +38,19 @@ spec: # The labels to add to any alert when communicating with Alertmanager labels: - region: {{ required ".Values.global.region missing" $.Values.global.region }} + region: {{ .Values.global.region }} {{- if $.Values.ruler.externalClusterLabels.enabled }} cluster: {{ if $.Values.global.cluster }}{{ $.Values.global.cluster }}{{ else }}{{ $.Values.global.region }} {{- end }} - cluster_type: {{ required ".Values.global.clusterType missing" $.Values.global.clusterType }} + cluster_type: {{ .Values.global.clusterType }} {{- else }} - cluster: {{ required ".Values.global.region missing" $.Values.global.region }} + cluster: {{ .Values.global.region }} {{- end }} alertQueryUrl: {{ $.Values.ruler.externalUrl }} # ??? - {{ if required "$.Values.ruler.alertmanagers.hosts missing" $.Values.ruler.alertmanagers.hosts }} + {{ .Values.ruler.alertmanagers.hosts }} alertmanagersConfig: name: {{ include "release.name" . }}-alertmanager-config # ??? key: alertManagerConfig.yaml - {{- end }} {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }} podMetadata: