Merge pull request #1837 from a7i/feat/servicemonitor-apiversion-1824

chart: allow overriding ServiceMonitor apiVersion

charts/descheduler/README.md

@@ -79,6 +79,7 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `nodeSelector`                      | Node selectors to run the descheduler cronjob/deployment on specific nodes                                            | `nil`                                     |
 | `service.enabled`                   | If `true`, create a service for deployment                                                                            | `false`                                   |
 | `serviceMonitor.enabled`            | If `true`, create a ServiceMonitor for deployment                                                                     | `false`                                   |
+| `serviceMonitor.apiVersion`         | API version used by the ServiceMonitor resource                                                                       | `monitoring.coreos.com/v1`                |
 | `serviceMonitor.namespace`          | The namespace where Prometheus expects to find service monitors                                                       | `nil`                                     |
 | `serviceMonitor.additionalLabels`   | Add custom labels to the ServiceMonitor resource                                                                      | `{}`                                      |
 | `serviceMonitor.interval`           | The scrape interval. If not set, the Prometheus default scrape interval is used                                       | `nil`                                     |

charts/descheduler/templates/servicemonitor.yaml

@@ -1,6 +1,6 @@
 {{- if eq .Values.kind "Deployment" }}
 {{- if eq .Values.serviceMonitor.enabled true }}
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.serviceMonitor.apiVersion | default "monitoring.coreos.com/v1" }}
 kind: ServiceMonitor
 metadata:
   name: {{ template "descheduler.fullname" . }}-servicemonitor

charts/descheduler/tests/servicemonitor_test.yaml

@@ -0,0 +1,31 @@
+suite: Test ServiceMonitor
+
+templates:
+  - "*.yaml"
+
+release:
+  name: descheduler
+
+set:
+  kind: Deployment
+  serviceMonitor:
+    enabled: true
+
+tests:
+  - it: uses default ServiceMonitor apiVersion
+    template: templates/servicemonitor.yaml
+    asserts:
+      - equal:
+          path: apiVersion
+          value: monitoring.coreos.com/v1
+
+  - it: supports overriding ServiceMonitor apiVersion
+    set:
+      serviceMonitor:
+        enabled: true
+        apiVersion: azmonitoring.coreos.com/v1
+    template: templates/servicemonitor.yaml
+    asserts:
+      - equal:
+          path: apiVersion
+          value: azmonitoring.coreos.com/v1

charts/descheduler/values.yaml

@@ -255,6 +255,7 @@ service:
 
 serviceMonitor:
   enabled: false
+  apiVersion: "monitoring.coreos.com/v1"
   # The namespace where Prometheus expects to find service monitors.
   # namespace: ""
   # Add custom labels to the ServiceMonitor resource