[kube-prometheus-stack] Move CRDs into sub-charts (#3547)

* [kube-prometheus-stack] Move CRDs into sub-charts Signed-off-by: Jan-Otto Kröpke <[email protected]> * fix lint Signed-off-by: Jan-Otto Kröpke <[email protected]> * Add toggle for sub-chart Signed-off-by: Jan-Otto Kröpke <[email protected]> * [kube-prometheus-stack] Move CRDs into sub-charts Signed-off-by: Jan-Otto Kröpke <[email protected]> * [kube-prometheus-stack] Add upgrade node Signed-off-by: Jan-Otto Kröpke <[email protected]> * fix lint Signed-off-by: Jan-Otto Kröpke <[email protected]> * Adjust CI values Signed-off-by: Jan-Otto Kröpke <[email protected]> --------- Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: Jan-Otto Kröpke <[email protected]> Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Jul 12, 2023 · 262ecde · 262ecde
1 parent 3cc956d
commit 262ecde
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 5 deletions.
diff --git a/charts/kube-prometheus-stack/.gitignore b/charts/kube-prometheus-stack/.gitignore
@@ -1,3 +1,8 @@
 # Python development for hack
 venv
 pyvenv.cfg
+!**
+charts/*
+!charts/crds/
+!charts/crds/**
+Chart.lock
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 47.6.1
+version: 48.0.0
 appVersion: v0.66.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
@@ -39,6 +39,9 @@ annotations:
       url: https://github.com/prometheus-operator/kube-prometheus
 
 dependencies:
+  - name: crds
+    version: "0.0.0"
+    condition: crds.enabled
   - name: kube-state-metrics
     version: "5.8.*"
     repository: https://prometheus-community.github.io/helm-charts

diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md
@@ -82,6 +82,13 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
 
 A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
 
+### From 47.x to 48.x
+
+This version moved all CRDs into a dedicated sub-chart. No new CRDs are introduced in this version.
+See [#3548](https://github.com/prometheus-community/helm-charts/issues/3548) for more context.
+
+We do not expect any breaking changes in this version.
+
 ### From 46.x to 47.x
 
 This version upgrades Prometheus-Operator to v0.66.0 with new CRDs (PrometheusAgent and ScrapeConfig).

diff --git a/charts/kube-prometheus-stack/charts/crds/Chart.yaml b/charts/kube-prometheus-stack/charts/crds/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: crds
+version: 0.0.0
diff --git a/charts/kube-prometheus-stack/charts/crds/README.md b/charts/kube-prometheus-stack/charts/crds/README.md
@@ -0,0 +1,3 @@
+# crds subchart
+
+See: [https://github.com/prometheus-community/helm-charts/issues/3548](https://github.com/prometheus-community/helm-charts/issues/3548)
diff --git a/...s-stack/crds/crd-alertmanagerconfigs.yaml → ...ts/crds/crds/crd-alertmanagerconfigs.yaml b/...s-stack/crds/crd-alertmanagerconfigs.yaml → ...ts/crds/crds/crd-alertmanagerconfigs.yaml
diff --git a/...metheus-stack/crds/crd-alertmanagers.yaml → ...k/charts/crds/crds/crd-alertmanagers.yaml b/...metheus-stack/crds/crd-alertmanagers.yaml → ...k/charts/crds/crds/crd-alertmanagers.yaml
diff --git a/...rometheus-stack/crds/crd-podmonitors.yaml → ...ack/charts/crds/crds/crd-podmonitors.yaml b/...rometheus-stack/crds/crd-podmonitors.yaml → ...ack/charts/crds/crds/crd-podmonitors.yaml
diff --git a/...ube-prometheus-stack/crds/crd-probes.yaml → ...us-stack/charts/crds/crds/crd-probes.yaml b/...ube-prometheus-stack/crds/crd-probes.yaml → ...us-stack/charts/crds/crds/crd-probes.yaml
diff --git a/...heus-stack/crds/crd-prometheusagents.yaml → ...harts/crds/crds/crd-prometheusagents.yaml b/...heus-stack/crds/crd-prometheusagents.yaml → ...harts/crds/crds/crd-prometheusagents.yaml
diff --git a/...ometheus-stack/crds/crd-prometheuses.yaml → ...ck/charts/crds/crds/crd-prometheuses.yaml b/...ometheus-stack/crds/crd-prometheuses.yaml → ...ck/charts/crds/crds/crd-prometheuses.yaml
diff --git a/...theus-stack/crds/crd-prometheusrules.yaml → ...charts/crds/crds/crd-prometheusrules.yaml b/...theus-stack/crds/crd-prometheusrules.yaml → ...charts/crds/crds/crd-prometheusrules.yaml
diff --git a/...metheus-stack/crds/crd-scrapeconfigs.yaml → ...k/charts/crds/crds/crd-scrapeconfigs.yaml b/...metheus-stack/crds/crd-scrapeconfigs.yaml → ...k/charts/crds/crds/crd-scrapeconfigs.yaml
diff --git a/...theus-stack/crds/crd-servicemonitors.yaml → ...charts/crds/crds/crd-servicemonitors.yaml b/...theus-stack/crds/crd-servicemonitors.yaml → ...charts/crds/crds/crd-servicemonitors.yaml
diff --git a/...ometheus-stack/crds/crd-thanosrulers.yaml → ...ck/charts/crds/crds/crd-thanosrulers.yaml b/...ometheus-stack/crds/crd-thanosrulers.yaml → ...ck/charts/crds/crds/crd-thanosrulers.yaml
diff --git a/charts/kube-prometheus-stack/ci/02-test-without-crds-values.yaml b/charts/kube-prometheus-stack/ci/02-test-without-crds-values.yaml
@@ -8,3 +8,6 @@ prometheus-node-exporter:
   service:
     targetPort: 9101
     port: 9101
+
+crds:
+  enabled: false
diff --git a/charts/kube-prometheus-stack/hack/update_crds.sh b/charts/kube-prometheus-stack/hack/update_crds.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 if [[ $(uname -s) = "Darwin" ]]; then
-    VERSION="$(grep ^appVersion ../Chart.yaml | sed 's/appVersion: //g')"
+    VERSION="$(grep ^appVersion "${SCRIPT_DIR}/../Chart.yaml" | sed 's/appVersion: //g')"
 else
-    VERSION="$(grep ^appVersion ../Chart.yaml | sed 's/appVersion:\s//g')"
+    VERSION="$(grep ^appVersion "${SCRIPT_DIR}/../Chart.yaml" | sed 's/appVersion:\s//g')"
 fi
 
 FILES=(
@@ -27,9 +29,9 @@ for line in "${FILES[@]}"; do
 
     echo -e "Downloading Prometheus Operator CRD with Version ${VERSION}:\n${URL}\n"
 
-    echo "# ${URL}" > ../crds/"${DESTINATION}"
+    echo "# ${URL}" > "${SCRIPT_DIR}/../charts/crds/crds/${DESTINATION}"
 
-    if ! curl --silent --retry-all-errors --fail --location "${URL}" >> ../crds/"${DESTINATION}"; then
+    if ! curl --silent --retry-all-errors --fail --location "${URL}" >> "${SCRIPT_DIR}/../charts/crds/crds/${DESTINATION}"; then
       echo -e "Failed to download ${URL}!"
       exit 1
     fi

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -28,6 +28,11 @@ commonLabels: {}
 # scmhash: abc123
 # myLabel: aakkmd
 
+## Install Prometheus Operator CRDs
+##
+crds:
+  enabled: true
+
 ## Create default rules for monitoring the cluster
 ##
 defaultRules:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# crds subchart

		See: [https://github.com/prometheus-community/helm-charts/issues/3548](https://github.com/prometheus-community/helm-charts/issues/3548)