diff --git a/charts/kube-prometheus-stack/.gitignore b/charts/kube-prometheus-stack/.gitignore index 3fb9e92adf9b..2da04e184c83 100644 --- 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/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 4eaa27f7fd72..fa6fd6ccd911 100644 --- 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 new file mode 100644 index 000000000000..ab08f23bfe11 --- /dev/null +++ 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/charts/kube-prometheus-stack/crds/crd-alertmanagerconfigs.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-alertmanagerconfigs.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-alertmanagerconfigs.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-alertmanagerconfigs.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-alertmanagers.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-alertmanagers.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-alertmanagers.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-alertmanagers.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-podmonitors.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-podmonitors.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-podmonitors.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-podmonitors.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-probes.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-probes.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-probes.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-probes.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-prometheusagents.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheusagents.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-prometheusagents.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheusagents.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-prometheuses.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheuses.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-prometheuses.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheuses.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheusrules.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-prometheusrules.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-scrapeconfigs.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-scrapeconfigs.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-scrapeconfigs.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-scrapeconfigs.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-servicemonitors.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-servicemonitors.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-servicemonitors.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-servicemonitors.yaml diff --git a/charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/charts/kube-prometheus-stack-crds/crds/crd-thanosrulers.yaml similarity index 100% rename from charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml rename to charts/kube-prometheus-stack/charts/kube-prometheus-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 index 6ff6175dc144..07ef8f841aaf 100755 --- 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}!"