weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6694 from inteon/fix_prometheus

Browse Source 
Clearify prometheus options and fix error in Helm chart
This commit is contained in:
jetstack-bot 2024-02-01 09:33:17 +00:00 committed by GitHub
commit 8218f4d2ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/charts/cert-manager/templates/deployment.yaml
View File

@ -42,7 +42,7 @@ spec:
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if and .Values.prometheus.enabled (not .Values.prometheus.servicemonitor.enabled) }}
{{- if and .Values.prometheus.enabled (not (or .Values.prometheus.servicemonitor.enabled .Values.prometheus.podmonitor.enabled)) }}
{{- if not .Values.podAnnotations }}
annotations:
{{- end }}

7
deploy/charts/cert-manager/values.yaml
View File

@ -420,10 +420,11 @@ enableServiceLinks: false
prometheus:
# Enable Prometheus monitoring for the cert-manager controller to use with the
# Prometheus Operator. Either `prometheus.servicemonitor.enabled` or
# `prometheus.podmonitor.enabled` can be used to create a ServiceMonitor/PodMonitor
# resource.
# 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.
# Otherwise, a ServiceMonitor/ PodMonitor is created.
enabled: true
servicemonitor:
# Create a ServiceMonitor to add cert-manager to Prometheus.
enabled: false