diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index e8dab2e81979..8051d3afcbc4 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -32,7 +32,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus # in case of changes within CRDs, a major version bump is mandatory. See: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#upgrading-chart -version: 68.3.3 +version: 69.0.0 appVersion: v0.79.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml index cb4aabaa7b52..f44b9bb542e5 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: List metadata: - name: {{ include "kube-prometheus-stack.fullname" $ }}-additional-prometheus-rules + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "additional-prometheus-rules" | trunc 63 | trimSuffix "-" }} namespace: {{ template "kube-prometheus-stack.namespace" . }} items: {{- if .Values.additionalPrometheusRulesMap }} @@ -10,7 +10,7 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "kube-prometheus-stack.name" $ }}-{{ $prometheusRuleName }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) $prometheusRuleName | trunc 63 | trimSuffix "-" }} namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: app: {{ template "kube-prometheus-stack.name" $ }} @@ -27,7 +27,7 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "kube-prometheus-stack.name" $ }}-{{ .name }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) .name | trunc 63 | trimSuffix "-" }} namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: app: {{ template "kube-prometheus-stack.name" $ }}