chore: add capability check for servicemonitor

Author: Demonsthere

helm/charts/hydra/templates/service-admin.yaml

@@ -32,7 +32,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "hydra.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and (.Values.serviceMonitor.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

helm/charts/keto/README.md

@@ -74,7 +74,7 @@ Access Control Policies as a Server
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Default image pull policy |
 | image.repository | string | `"oryd/keto"` | Ory KETO image |
-| image.tag | string | `"v0.12.0"` | Ory KETO version |
+| image.tag | string | `"v0.14.0"` | Ory KETO version |
 | imagePullSecrets | list | `[]` |  |
 | ingress.read.annotations | object | `{}` |  |
 | ingress.read.className | string | `""` |  |

helm/charts/kratos/templates/service-admin.yaml

@@ -37,7 +37,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "kratos.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and (.Values.serviceMonitor.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

helm/charts/kratos/templates/statefulset-svc.yaml

@@ -35,7 +35,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "kratos.fullname" . }}-courier
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.serviceMonitor.enabled }}
+{{- if and (.Values.serviceMonitor.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

helm/charts/oathkeeper/README.md

@@ -137,6 +137,7 @@ A Helm chart for deploying ORY Oathkeeper in Kubernetes
 | service.proxy.name | string | `"http"` | The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio) |
 | service.proxy.port | int | `4455` | The service port |
 | service.proxy.type | string | `"ClusterIP"` | The service type |
+| serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.labels | object | `{}` | Provide additional labels to the ServiceMonitor resource metadata |
 | serviceMonitor.metricRelabelings | list | `[]` | Provide additional metricRelabelings to apply to samples before ingestion. |
 | serviceMonitor.relabelings | list | `[]` | Provide additional relabelings to apply to samples before scraping |

helm/charts/oathkeeper/templates/service-metrics.yaml

@@ -32,7 +32,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "oathkeeper.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
+{{- if and (.Values.serviceMonitor.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

helm/charts/oathkeeper/values.yaml

@@ -395,6 +395,7 @@ pdb:
 ## -- Parameters for the Prometheus ServiceMonitor objects.
 # Reference: https://docs.openshift.com/container-platform/4.6/rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.html
 serviceMonitor:
+  enabled: false
   # -- HTTP scheme to use for scraping.
   scheme: http
   # -- Interval at which metrics should be scraped