feat(serviceMonitor): Add flag to disable CRD check for mass server-s…

…ide apply (#1077)
Kong · Oct 11, 2024 · 0b3ad20 · 0b3ad20
1 parent 46c2fa0
commit 0b3ad20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+* Added serviceMonitor.trustCRDsExist for render based deployments
 
 ### Changes
 

diff --git a/charts/kong/README.md b/charts/kong/README.md
@@ -908,6 +908,7 @@ On the Gateway release side, set either `admin.tls.client.secretName` to the nam
 | securityContext                    | Set the securityContext for Kong Pods                                                 | `{}`                |
 | containerSecurityContext           | Set the securityContext for Containers                                                | See values.yaml     |
 | serviceMonitor.enabled             | Create ServiceMonitor for Prometheus Operator                                         | `false`             |
+| serviceMonitor.trustCRDsExist      | Do not check for the Prometheus Operator CRDs, just try to deploy                     | `false`             |
 | serviceMonitor.interval            | Scraping interval                                                                     | `30s`               |
 | serviceMonitor.namespace           | Where to create ServiceMonitor                                                        |                     |
 | serviceMonitor.labels              | ServiceMonitor labels                                                                 | `{}`                |

diff --git a/charts/kong/templates/servicemonitor.yaml b/charts/kong/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.serviceMonitor.enabled }}
+{{- if and .Values.serviceMonitor.enabled (or (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.serviceMonitor.trustCRDsExist) }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/charts/kong/values.yaml b/charts/kong/values.yaml
@@ -1011,6 +1011,7 @@ serviceMonitor:
   # If you wish to gather metrics from a Kong instance with the proxy disabled (such as a hybrid control plane), see:
   # https://github.com/Kong/charts/blob/main/charts/kong/README.md#prometheus-operator-integration
   enabled: false
+  trustCRDsExist: false
   # interval: 30s
   # Specifies namespace, where ServiceMonitor should be installed
   # namespace: monitoring