Merge pull request #6703 from SgtCoDFish/release-1.14-promfix

jetstack-bot · web-flow · commit 95d6fc4b3206 · 2024-02-01T15:29:18.000Z
[release-1.14] Fix backwards incompatible change: include a prometheus service by default
diff --git a/deploy/charts/cert-manager/templates/service.yaml b/deploy/charts/cert-manager/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.prometheus.enabled .Values.prometheus.servicemonitor.enabled }}
+{{- if and .Values.prometheus.enabled (not .Values.prometheus.podmonitor.enabled) }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml
@@ -419,10 +419,12 @@ enableServiceLinks: false
 # +docs:section=Prometheus
 
 prometheus:
-  # Enable prometheus monitoring for the cert-manager controller, to use with
-  # Prometheus Operator either `prometheus.servicemonitor.enabled` or
-  # `prometheus.podmonitor.enabled` can be used to create a ServiceMonitor/PodMonitor
-  # resource
+  # Enable Prometheus monitoring for the cert-manager controller to use with the
+  # Prometheus Operator. If this option is enabled without enabling `prometheus.servicemonitor.enabled` or
+  # `prometheus.podmonitor.enabled`, 'prometheus.io' annotations are added to the cert-manager Deployment
+  # resources. Additionally, a service is created which can be used together
+  # with your own ServiceMonitor (managed outside of this Helm chart).
+  # Otherwise, a ServiceMonitor/ PodMonitor is created.
   enabled: true
   servicemonitor:
     # Create a ServiceMonitor to add cert-manager to Prometheus

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if and .Values.prometheus.enabled .Values.prometheus.servicemonitor.enabled }}`
	`1`	`+{{- if and .Values.prometheus.enabled (not .Values.prometheus.podmonitor.enabled) }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: Service`
`4`	`4`	`metadata:`