From b91accc7e7d4119c65d9333bb1232de955013a0e Mon Sep 17 00:00:00 2001 From: juan ramino Date: Fri, 27 Oct 2023 12:35:16 +0200 Subject: [PATCH 1/5] [kube-prometheus-stack] add annotations to crds Signed-off-by: juan ramino --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../charts/crds/crds/crd-alertmanagerconfigs.yaml | 3 +++ .../charts/crds/crds/crd-alertmanagers.yaml | 3 +++ .../charts/crds/crds/crd-podmonitors.yaml | 3 +++ charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml | 3 +++ .../charts/crds/crds/crd-prometheusagents.yaml | 3 +++ .../charts/crds/crds/crd-prometheuses.yaml | 3 +++ .../charts/crds/crds/crd-prometheusrules.yaml | 3 +++ .../charts/crds/crds/crd-scrapeconfigs.yaml | 3 +++ .../charts/crds/crds/crd-servicemonitors.yaml | 3 +++ .../charts/crds/crds/crd-thanosrulers.yaml | 3 +++ charts/kube-prometheus-stack/values.yaml | 1 + 12 files changed, 32 insertions(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 067e65ddb41a..c87d6e79add8 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: 52.1.0 +version: 52.2.0 appVersion: v0.68.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml index 5081e805d6d4..585b09e39251 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: alertmanagerconfigs.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml index 3cc6d45dc505..1a47f956d409 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: alertmanagers.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml index ceaf19e9e8e3..e44a380fafa2 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: podmonitors.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml index 1ebe86f1fa6d..c64fed703f5b 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: probes.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml index 3359beebff0d..205cea74379f 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: prometheusagents.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml index 200d033eea1b..1608dfbe9b01 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: prometheuses.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml index 703b05b1f2b9..ca8336388db7 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: prometheusrules.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml index 7c7314d6aeca..46204dc5344e 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: scrapeconfigs.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml index e6728a5286b8..1caeaa612915 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: servicemonitors.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml index 6bfa675cdd80..240a6a56b38a 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml @@ -5,6 +5,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 +{{- if .Values.crds.annotations }} +{{ toYaml .Values.crds.annotations | indent 4 }} +{{- end }} creationTimestamp: null name: thanosrulers.monitoring.coreos.com spec: diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index c0eee10c9d76..c941cf01ae44 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -32,6 +32,7 @@ commonLabels: {} ## crds: enabled: true + annotations: {} ## Create default rules for monitoring the cluster ## From b4c6a50311d15b29d4a838b224b9dfbd3a3d4a78 Mon Sep 17 00:00:00 2001 From: juan ramino Date: Fri, 27 Oct 2023 12:49:31 +0200 Subject: [PATCH 2/5] fix value Signed-off-by: juan ramino --- .../charts/crds/crds/crd-alertmanagerconfigs.yaml | 4 ++-- .../charts/crds/crds/crd-alertmanagers.yaml | 4 ++-- .../charts/crds/crds/crd-podmonitors.yaml | 4 ++-- charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml | 4 ++-- .../charts/crds/crds/crd-prometheusagents.yaml | 4 ++-- .../charts/crds/crds/crd-prometheuses.yaml | 4 ++-- .../charts/crds/crds/crd-prometheusrules.yaml | 4 ++-- .../charts/crds/crds/crd-scrapeconfigs.yaml | 4 ++-- .../charts/crds/crds/crd-servicemonitors.yaml | 4 ++-- .../charts/crds/crds/crd-thanosrulers.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml index 585b09e39251..6c6f4bb90298 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: alertmanagerconfigs.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml index 1a47f956d409..1a1c30cef824 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: alertmanagers.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml index e44a380fafa2..9196da19cdec 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: podmonitors.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml index c64fed703f5b..a0e86fbdd51a 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: probes.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml index 205cea74379f..467ab94091f8 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: prometheusagents.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml index 1608dfbe9b01..b781a2b1d4be 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: prometheuses.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml index ca8336388db7..785940192737 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: prometheusrules.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml index 46204dc5344e..bcad8bf5e6cd 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: scrapeconfigs.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml index 1caeaa612915..60d993bcb21f 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: servicemonitors.monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml index 240a6a56b38a..58589fda6447 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml @@ -5,8 +5,8 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.1 -{{- if .Values.crds.annotations }} -{{ toYaml .Values.crds.annotations | indent 4 }} +{{- if .Values.annotations }} +{{ toYaml .Values.annotations | indent 4 }} {{- end }} creationTimestamp: null name: thanosrulers.monitoring.coreos.com From 0588116fe42ec93aeac0507df2f0aa8243666a73 Mon Sep 17 00:00:00 2001 From: juan ramino Date: Fri, 27 Oct 2023 13:03:21 +0200 Subject: [PATCH 3/5] move crds to templates folder Signed-off-by: juan ramino --- .../charts/crds/{crds => templates}/crd-alertmanagerconfigs.yaml | 0 .../charts/crds/{crds => templates}/crd-alertmanagers.yaml | 0 .../charts/crds/{crds => templates}/crd-podmonitors.yaml | 0 .../charts/crds/{crds => templates}/crd-probes.yaml | 0 .../charts/crds/{crds => templates}/crd-prometheusagents.yaml | 0 .../charts/crds/{crds => templates}/crd-prometheuses.yaml | 0 .../charts/crds/{crds => templates}/crd-prometheusrules.yaml | 0 .../charts/crds/{crds => templates}/crd-scrapeconfigs.yaml | 0 .../charts/crds/{crds => templates}/crd-servicemonitors.yaml | 0 .../charts/crds/{crds => templates}/crd-thanosrulers.yaml | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-alertmanagerconfigs.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-alertmanagers.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-podmonitors.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-probes.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-prometheusagents.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-prometheuses.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-prometheusrules.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-scrapeconfigs.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-servicemonitors.yaml (100%) rename charts/kube-prometheus-stack/charts/crds/{crds => templates}/crd-thanosrulers.yaml (100%) diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-alertmanagerconfigs.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-alertmanagerconfigs.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-alertmanagers.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-alertmanagers.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-podmonitors.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-podmonitors.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-probes.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-probes.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-prometheusagents.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-prometheusagents.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-prometheuses.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-prometheuses.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-prometheusrules.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-prometheusrules.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-scrapeconfigs.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-scrapeconfigs.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-servicemonitors.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-servicemonitors.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/charts/crds/templates/crd-thanosrulers.yaml similarity index 100% rename from charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml rename to charts/kube-prometheus-stack/charts/crds/templates/crd-thanosrulers.yaml From 0163fbc31afa3f7d90e766bd45ca806036619bd7 Mon Sep 17 00:00:00 2001 From: juan ramino Date: Fri, 27 Oct 2023 13:03:48 +0200 Subject: [PATCH 4/5] add values to crds Signed-off-by: juan ramino --- charts/kube-prometheus-stack/charts/crds/values.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 charts/kube-prometheus-stack/charts/crds/values.yaml diff --git a/charts/kube-prometheus-stack/charts/crds/values.yaml b/charts/kube-prometheus-stack/charts/crds/values.yaml new file mode 100644 index 000000000000..9d2455b3a2cd --- /dev/null +++ b/charts/kube-prometheus-stack/charts/crds/values.yaml @@ -0,0 +1 @@ +annotations: {} From 790be04d9f89c4334541c6cf6d4b93a89cf12ed4 Mon Sep 17 00:00:00 2001 From: juan ramino Date: Fri, 27 Oct 2023 15:12:25 +0200 Subject: [PATCH 5/5] update creds reference in sh script Signed-off-by: juan ramino --- charts/kube-prometheus-stack/hack/update_crds.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/hack/update_crds.sh b/charts/kube-prometheus-stack/hack/update_crds.sh index 22d7124516c7..fd72ea971329 100755 --- a/charts/kube-prometheus-stack/hack/update_crds.sh +++ b/charts/kube-prometheus-stack/hack/update_crds.sh @@ -29,9 +29,9 @@ for line in "${FILES[@]}"; do echo -e "Downloading Prometheus Operator CRD with Version ${VERSION}:\n${URL}\n" - echo "# ${URL}" > "${SCRIPT_DIR}/../charts/crds/crds/${DESTINATION}" + echo "# ${URL}" > "${SCRIPT_DIR}/../charts/crds/templates/${DESTINATION}" - if ! curl --silent --retry-all-errors --fail --location "${URL}" >> "${SCRIPT_DIR}/../charts/crds/crds/${DESTINATION}"; then + if ! curl --silent --retry-all-errors --fail --location "${URL}" >> "${SCRIPT_DIR}/../charts/crds/templates/${DESTINATION}"; then echo -e "Failed to download ${URL}!" exit 1 fi