From 830e4290ff52bc3db694506006a7a321e2beca7a Mon Sep 17 00:00:00 2001 From: treydock Date: Thu, 16 Nov 2023 10:42:56 -0500 Subject: [PATCH] Revert "fix(chart): only create ServiceMonitor if cluster supports it (#7926)" (#8913) This reverts commit 590dce5830888ab592cb69e44ed57dd486403347. This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities Fixes #8891 Signed-off-by: Trey Dockendorf Co-authored-by: shuting --- charts/kyverno/Chart.yaml | 2 -- .../kyverno/templates/admission-controller/servicemonitor.yaml | 2 +- .../kyverno/templates/background-controller/servicemonitor.yaml | 2 +- charts/kyverno/templates/cleanup-controller/servicemonitor.yaml | 2 +- charts/kyverno/templates/reports-controller/servicemonitor.yaml | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml index 61f709fd2e..6aa5bce196 100644 --- a/charts/kyverno/Chart.yaml +++ b/charts/kyverno/Chart.yaml @@ -35,8 +35,6 @@ annotations: artifacthub.io/changes: | - kind: added description: support for GrafanaDashboard custom resource - - kind: changed - description: only create ServiceMonitor if cluster supports it - kind: fixed description: rbac templating issues - kind: added diff --git a/charts/kyverno/templates/admission-controller/servicemonitor.yaml b/charts/kyverno/templates/admission-controller/servicemonitor.yaml index 25a203ab7c..d97ab2f385 100644 --- a/charts/kyverno/templates/admission-controller/servicemonitor.yaml +++ b/charts/kyverno/templates/admission-controller/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.admissionController.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }} +{{- if .Values.admissionController.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/kyverno/templates/background-controller/servicemonitor.yaml b/charts/kyverno/templates/background-controller/servicemonitor.yaml index 5745ac307a..67c38a22d6 100644 --- a/charts/kyverno/templates/background-controller/servicemonitor.yaml +++ b/charts/kyverno/templates/background-controller/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.backgroundController.enabled -}} -{{- if and .Values.backgroundController.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") -}} +{{- if .Values.backgroundController.serviceMonitor.enabled -}} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml b/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml index a26eb643b9..e9f50e6347 100644 --- a/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml +++ b/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.cleanupController.enabled -}} -{{- if and .Values.cleanupController.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") -}} +{{- if .Values.cleanupController.serviceMonitor.enabled -}} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/kyverno/templates/reports-controller/servicemonitor.yaml b/charts/kyverno/templates/reports-controller/servicemonitor.yaml index 1f97b1ecb0..681e3d9931 100644 --- a/charts/kyverno/templates/reports-controller/servicemonitor.yaml +++ b/charts/kyverno/templates/reports-controller/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.reportsController.enabled -}} -{{- if and .Values.reportsController.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") -}} +{{- if .Values.reportsController.serviceMonitor.enabled -}} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: