Move kube-prometheus-stack crds out of helm/prometheus chart

PhilippMatthes · PhilippMatthes · commit 867465e5f75c · 2025-04-22T10:50:16.000+02:00
Before, the helm/prometheus chart would package a large helm release due to the crds being included. Now, the crds are included in a separate chart intended for debugging with the local tilt setup.
diff --git a/Tiltfile b/Tiltfile
@@ -79,10 +79,8 @@ k8s_resource('cortex-postgresql', port_forwards=[
 ], labels=['Core-Services'])
 
 ########### Monitoring
-k8s_yaml(helm('./helm/prometheus', name='cortex-prometheus', set=[
-    # Deploy prometheus operator CRDs, Prometheus, and Alertmanager
-    'kube-prometheus-stack.enabled=true',
-]))
+k8s_yaml(helm('./helm/prometheus-deps', name='cortex-prometheus-deps')) # Operator
+k8s_yaml(helm('./helm/prometheus', name='cortex-prometheus')) # Alerts + ServiceMonitor
 k8s_resource('cortex-prometheus-operator', labels=['Monitoring'])
 k8s_resource(
     new_name='cortex-prometheus',
diff --git a/helm/prometheus-deps/.gitignore b/helm/prometheus-deps/.gitignore
@@ -0,0 +1,4 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
+Chart.lock
diff --git a/helm/prometheus-deps/.helmignore b/helm/prometheus-deps/.helmignore
@@ -0,0 +1,27 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+charts/.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/helm/prometheus-deps/Chart.yaml b/helm/prometheus-deps/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v2
+description: Prometheus alerts setup for Cortex.
+name: cortex-alerts
+version: 0.2.0
+dependencies:
+  # CRDs of the prometheus operator, such as PrometheusRule, ServiceMonitor, etc.
+  - name: kube-prometheus-stack
+    repository: https://prometheus-community.github.io/helm-charts
+    version: 70.7.0
+  # Owner info adds a configmap to the kubernetes cluster with information on
+  # the service owner. This makes it easier to find out who to contact in case
+  # of issues. See: https://github.com/sapcc/helm-charts/pkgs/container/helm-charts%2Fowner-info
+  - name: owner-info
+    repository: oci://ghcr.io/sapcc/helm-charts
+    version: 1.0.0
diff --git a/helm/prometheus-deps/charts/.gitignore b/helm/prometheus-deps/charts/.gitignore
@@ -0,0 +1,5 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
+*
+!.gitignore
diff --git a/helm/prometheus-deps/templates/alertmanager.yaml b/helm/prometheus-deps/templates/alertmanager.yaml
@@ -1,7 +1,6 @@
 # Copyright 2025 SAP SE
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:
@@ -30,4 +29,3 @@ spec:
   alertmanagerConfigSelector:
     matchLabels:
       alertmanagerConfig: cortex-alertmanager
-{{- end }}
diff --git a/helm/prometheus-deps/templates/prometheus.yaml b/helm/prometheus-deps/templates/prometheus.yaml
@@ -1,7 +1,6 @@
 # Copyright 2025 SAP SE
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
@@ -25,4 +24,3 @@ spec:
   ruleSelector:
     matchLabels:
       type: alerting-rules
-{{- end }}
diff --git a/helm/prometheus-deps/templates/rbac.yaml b/helm/prometheus-deps/templates/rbac.yaml
@@ -1,7 +1,6 @@
 # Copyright 2025 SAP SE
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -44,4 +43,3 @@ subjects:
 - kind: ServiceAccount
   name: cortex-prometheus
   namespace: default
-{{- end }}
diff --git a/helm/prometheus-deps/values.yaml b/helm/prometheus-deps/values.yaml
@@ -0,0 +1,56 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
+kube-prometheus-stack:
+  # kube-prometheus-stack deploys a bunch of junk we don't need.
+  # Therefore, we disable all components and only enable the prometheus operator.
+  # See: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/ci/01-provision-crds-values.yaml
+  coreDns:
+    enabled: false
+  kubeApiServer:
+    enabled: false
+  kubeControllerManager:
+    enabled: false
+  kubeDns:
+    enabled: false
+  kubeEtcd:
+    enabled: false
+  kubeProxy:
+    enabled: false
+  kubeScheduler:
+    enabled: false
+  kubeStateMetrics:
+    enabled: false
+  kubelet:
+    enabled: false
+  nodeExporter:
+    enabled: false
+  grafana:
+    enabled: false
+  defaultRules:
+    create: false
+  alertmanager:
+    enabled: false
+  prometheus:
+    enabled: false
+  fullnameOverride: "cortex"
+  prometheusOperator:
+    enabled: true
+    fullnameOverride: cortex-prometheus-operator
+    serviceMonitor:
+      selfMonitor: false
+    tls:
+      enabled: false
+    admissionWebhooks:
+      enabled: false
+    namespaces:
+      releaseNamespace: true
+      additional:
+        - kube-system
+
+owner-info:
+  helm-chart-url: "https://github.com/cobaltcore-dev/cortex/helm/prometheus"
+  maintainers:
+    - "p.matthes@sap.com"
+  support-group: "cobaltcore-dev"
+  enabled: true
diff --git a/helm/prometheus/Chart.yaml b/helm/prometheus/Chart.yaml
@@ -4,13 +4,8 @@
 apiVersion: v2
 description: Prometheus alerts setup for Cortex.
 name: cortex-alerts
-version: 0.1.0
+version: 0.2.0
 dependencies:
-  # CRDs of the prometheus operator, such as PrometheusRule, ServiceMonitor, etc.
-  - name: kube-prometheus-stack
-    repository: https://prometheus-community.github.io/helm-charts
-    version: 70.7.0
-    condition: kube-prometheus-stack.enabled
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
   # of issues. See: https://github.com/sapcc/helm-charts/pkgs/container/helm-charts%2Fowner-info
diff --git a/helm/prometheus/values.yaml b/helm/prometheus/values.yaml
@@ -34,57 +34,6 @@ alerts:
     cortexSyncObjectsTooHigh:
       severity: info
 
-kube-prometheus-stack:
-  # Whether the CRDs of the prometheus-operator should be deployed
-  # together with a prometheus and alertmanager instance.
-  enabled: false
-
-  # kube-prometheus-stack deploys a bunch of junk we don't need.
-  # Therefore, we disable all components and only enable the prometheus operator.
-  # See: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/ci/01-provision-crds-values.yaml
-  coreDns:
-    enabled: false
-  kubeApiServer:
-    enabled: false
-  kubeControllerManager:
-    enabled: false
-  kubeDns:
-    enabled: false
-  kubeEtcd:
-    enabled: false
-  kubeProxy:
-    enabled: false
-  kubeScheduler:
-    enabled: false
-  kubeStateMetrics:
-    enabled: false
-  kubelet:
-    enabled: false
-  nodeExporter:
-    enabled: false
-  grafana:
-    enabled: false
-  defaultRules:
-    create: false
-  alertmanager:
-    enabled: false
-  prometheus:
-    enabled: false
-  fullnameOverride: "cortex"
-  prometheusOperator:
-    enabled: true
-    fullnameOverride: cortex-prometheus-operator
-    serviceMonitor:
-      selfMonitor: false
-    tls:
-      enabled: false
-    admissionWebhooks:
-      enabled: false
-    namespaces:
-      releaseNamespace: true
-      additional:
-        - kube-system
-
 owner-info:
   helm-chart-url: "https://github.com/cobaltcore-dev/cortex/helm/prometheus"
   maintainers:
