[kube-prometheus-stack] Move CRDs into sub-charts

Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Jul 3, 2023 · 0d0cc73 · 0d0cc73
1 parent 990fcbc
commit 0d0cc73
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 2 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/kube-prometheus-stack-crds/
+!charts/kube-prometheus-stack-crds/**
+Chart.lock
diff --git a/charts/kube-prometheus-stack/.helmignore b/charts/kube-prometheus-stack/.helmignore
@@ -26,3 +26,5 @@ ci/
 kube-prometheus-*.tgz
 
 unittests/
+CONTRIBUTING.md
+README.md
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.2.0
+version: 48.0.0
 appVersion: v0.66.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
@@ -39,6 +39,8 @@ annotations:
       url: https://github.com/prometheus-operator/kube-prometheus
 
 dependencies:
+  - name: kube-prometheus-stack-crds
+    version: "0.0.0"
   - name: kube-state-metrics
     version: "5.8.*"
     repository: https://prometheus-community.github.io/helm-charts

diff --git a/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/Chart.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: kube-prometheus-stack-crds
+version: 0.0.0
diff --git a/...s-stack/crds/crd-alertmanagerconfigs.yaml → ...ck-crds/crds/crd-alertmanagerconfigs.yaml b/...s-stack/crds/crd-alertmanagerconfigs.yaml → ...ck-crds/crds/crd-alertmanagerconfigs.yaml
diff --git a/...metheus-stack/crds/crd-alertmanagers.yaml → ...us-stack-crds/crds/crd-alertmanagers.yaml b/...metheus-stack/crds/crd-alertmanagers.yaml → ...us-stack-crds/crds/crd-alertmanagers.yaml
diff --git a/...rometheus-stack/crds/crd-podmonitors.yaml → ...heus-stack-crds/crds/crd-podmonitors.yaml b/...rometheus-stack/crds/crd-podmonitors.yaml → ...heus-stack-crds/crds/crd-podmonitors.yaml
diff --git a/...ube-prometheus-stack/crds/crd-probes.yaml → ...rometheus-stack-crds/crds/crd-probes.yaml b/...ube-prometheus-stack/crds/crd-probes.yaml → ...rometheus-stack-crds/crds/crd-probes.yaml
diff --git a/...heus-stack/crds/crd-prometheusagents.yaml → ...stack-crds/crds/crd-prometheusagents.yaml b/...heus-stack/crds/crd-prometheusagents.yaml → ...stack-crds/crds/crd-prometheusagents.yaml
diff --git a/...ometheus-stack/crds/crd-prometheuses.yaml → ...eus-stack-crds/crds/crd-prometheuses.yaml b/...ometheus-stack/crds/crd-prometheuses.yaml → ...eus-stack-crds/crds/crd-prometheuses.yaml
diff --git a/...theus-stack/crds/crd-prometheusrules.yaml → ...-stack-crds/crds/crd-prometheusrules.yaml b/...theus-stack/crds/crd-prometheusrules.yaml → ...-stack-crds/crds/crd-prometheusrules.yaml
diff --git a/...metheus-stack/crds/crd-scrapeconfigs.yaml → ...us-stack-crds/crds/crd-scrapeconfigs.yaml b/...metheus-stack/crds/crd-scrapeconfigs.yaml → ...us-stack-crds/crds/crd-scrapeconfigs.yaml
diff --git a/...theus-stack/crds/crd-servicemonitors.yaml → ...-stack-crds/crds/crd-servicemonitors.yaml b/...theus-stack/crds/crd-servicemonitors.yaml → ...-stack-crds/crds/crd-servicemonitors.yaml
diff --git a/...ometheus-stack/crds/crd-thanosrulers.yaml → ...eus-stack-crds/crds/crd-thanosrulers.yaml b/...ometheus-stack/crds/crd-thanosrulers.yaml → ...eus-stack-crds/crds/crd-thanosrulers.yaml
diff --git a/charts/kube-prometheus-stack/hack/update_crds.sh b/charts/kube-prometheus-stack/hack/update_crds.sh
@@ -27,7 +27,7 @@ for line in "${FILES[@]}"; do
 
     echo -e "Downloading Prometheus Operator CRD with Version ${VERSION}:\n${URL}\n"
 
-    echo "# ${URL}" > ../crds/"${DESTINATION}"
+    echo "# ${URL}" > ../charts/kube-prometheus-stack-crds/crds/"${DESTINATION}"
 
     if ! curl --silent --retry-all-errors --fail --location "${URL}" >> ../crds/"${DESTINATION}"; then
       echo -e "Failed to download ${URL}!"