fix: disable monitoring.coreos.com/v1 api check (#653)

ory · Nov 28, 2023 · ac2b530 · ac2b530
1 parent 831cdf2
commit ac2b530
Show file tree

Hide file tree

Showing 8 changed files with 727 additions and 7 deletions.
diff --git a/hacks/helm-validate.sh b/hacks/helm-validate.sh
@@ -7,4 +7,4 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/.."
 schema_url="https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/"
 k8s_version="1.27.2"
 
-helm kubeconform "./helm/charts/${1}" --strict --schema-location "${schema_url}" -f "hacks/values/${1}.yaml" --kubernetes-version "${k8s_version}" --summary --verbose
+helm kubeconform "./helm/charts/${1}" --strict --schema-location "${schema_url}" --schema-location ./hacks/servicemonitor_v1.json -f "hacks/values/${1}.yaml" --kubernetes-version "${k8s_version}" --summary --verbose
diff --git a/hacks/servicemonitor_v1.json b/hacks/servicemonitor_v1.json
diff --git a/hacks/values/hydra.yaml b/hacks/values/hydra.yaml
@@ -129,6 +129,7 @@ watcher:
     runAsNonRoot: true
 
 serviceMonitor:
+  enabled: true
   labels:
     release: "prometheus"
   tlsConfig:

diff --git a/hacks/values/kratos.yaml b/hacks/values/kratos.yaml
@@ -322,6 +322,7 @@ cronjob:
       runAsNonRoot: true
 
 serviceMonitor:
+  enabled: true
   labels:
     release: "prometheus"
   tlsConfig:

diff --git a/helm/charts/hydra/templates/service-admin.yaml b/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 and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") (.Values.serviceMonitor.enabled) }}
+{{- if .Values.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/helm/charts/hydra/values.yaml b/helm/charts/hydra/values.yaml
@@ -606,8 +606,8 @@ 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:
-  # -- switch to false to prevent creating the ServiceMonitor
-  enabled: true
+  # -- switch to true to enable creating the ServiceMonitor
+  enabled: false
   # -- HTTP scheme to use for scraping.
   scheme: http
   # -- Interval at which metrics should be scraped

diff --git a/helm/charts/kratos/templates/service-admin.yaml b/helm/charts/kratos/templates/service-admin.yaml
@@ -32,7 +32,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "kratos.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") (.Values.serviceMonitor.enabled) }}
+{{- if .Values.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/helm/charts/kratos/values.yaml b/helm/charts/kratos/values.yaml
@@ -690,8 +690,8 @@ 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:
-  # -- switch to false to prevent creating the ServiceMonitor
-  enabled: true
+  # -- switch to true to enable creating the ServiceMonitor
+  enabled: false
   # -- HTTP scheme to use for scraping.
   scheme: http
   # -- Interval at which metrics should be scraped