diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 02275ca1d811..7de3ea45cc59 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 66.1.0 +version: 66.1.1 appVersion: v0.78.1 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml index 2b6a5edf6953..9973dc2fced1 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml @@ -253,13 +253,13 @@ spec: scrapeConfigSelector: matchLabels: release: {{ $.Release.Name | quote }} -{{ else if ne .Values.prometheus.prometheusSpec.scrapeConfigSelector nil }} +{{ else if not (kindIs "invalid" .Values.prometheus.prometheusSpec.scrapeConfigSelector) }} scrapeConfigSelector: {} {{- end }} {{- if .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector }} scrapeConfigNamespaceSelector: {{ tpl (toYaml .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector | indent 4) . }} -{{ else if ne .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector nil }} +{{ else if not (kindIs "invalid" .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector) }} scrapeConfigNamespaceSelector: {} {{- end }} {{- if .Values.prometheus.prometheusSpec.storageSpec }}