Merge branch 'main' into main

vmware-tanzu · Aug 3, 2023 · 72e3145 · 72e3145
2 parents 38743b2 + 7857b47
commit 72e3145
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/charts/velero/templates/prometheusrule.yaml b/charts/velero/templates/prometheusrule.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- if and (and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled) (or (not .Values.metrics.prometheusRule.autodetect) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1")) (.Values.metrics.prometheusRule.spec) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -201,6 +201,7 @@ metrics:
     # tlsConfig: {}
 
   prometheusRule:
+    autodetect: true
     enabled: false
     # Additional labels to add to deployed PrometheusRule
     additionalLabels: {}