From c228a232c9f2b98cc0b646a5ab11ab1576ccfe12 Mon Sep 17 00:00:00 2001
From: Andrii Chubatiuk <andrew.chubatiuk@gmail.com>
Date: Wed, 11 Sep 2024 09:27:51 +0300
Subject: [PATCH] avoid publishing crd chart

---
 .gitignore                                       |   4 ++--
 charts/victoria-metrics-k8s-stack/Chart.lock     |   6 +++---
 charts/victoria-metrics-k8s-stack/Chart.yaml     |   4 ++--
 charts/victoria-metrics-k8s-stack/charts/crds    |   1 +
 .../charts/victoria-metrics-crds                 |   1 -
 charts/victoria-metrics-k8s-stack/values.yaml    |   5 ++++-
 charts/victoria-metrics-operator/Chart.lock      |   8 ++++----
 charts/victoria-metrics-operator/Chart.yaml      |   4 ++--
 .../charts/crds}/Chart.lock                      |   0
 .../charts/crds}/Chart.yaml                      |   2 +-
 .../charts/victoria-metrics-common-0.0.10.tgz    | Bin 0 -> 5692 bytes
 .../charts/crds}/crds/crd.yaml                   |   0
 .../charts/crds}/templates/_helpers.yaml         |   0
 .../charts/crds}/templates/cleanup.yaml          |   0
 .../charts/crds}/values.yaml                     |   0
 .../charts/victoria-metrics-crds                 |   1 -
 .../templates/role.yaml                          |   6 +++---
 charts/victoria-metrics-operator/values.yaml     |   2 +-
 hack/helm/victoria-metrics-crds/e2e/simple.yaml  |   2 --
 hack/helm/victoria-metrics-crds/lint/simple.yaml |   2 --
 20 files changed, 23 insertions(+), 25 deletions(-)
 create mode 120000 charts/victoria-metrics-k8s-stack/charts/crds
 delete mode 120000 charts/victoria-metrics-k8s-stack/charts/victoria-metrics-crds
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/Chart.lock (100%)
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/Chart.yaml (90%)
 create mode 100644 charts/victoria-metrics-operator/charts/crds/charts/victoria-metrics-common-0.0.10.tgz
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/crds/crd.yaml (100%)
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/templates/_helpers.yaml (100%)
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/templates/cleanup.yaml (100%)
 rename charts/{victoria-metrics-crds => victoria-metrics-operator/charts/crds}/values.yaml (100%)
 delete mode 120000 charts/victoria-metrics-operator/charts/victoria-metrics-crds
 delete mode 100644 hack/helm/victoria-metrics-crds/e2e/simple.yaml
 delete mode 100644 hack/helm/victoria-metrics-crds/lint/simple.yaml

diff --git a/.gitignore b/.gitignore
index b6689b3a4..16f6543d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 .DS_Store
 .vscode/
 charts/*/charts/**
-!charts/*/charts/victoria-metrics-crds
-!charts/*/charts/victoria-metrics-crds/**
+!charts/*/charts/crds
+!charts/*/charts/crds/**
 .helm/
 .local/
 tmp/
diff --git a/charts/victoria-metrics-k8s-stack/Chart.lock b/charts/victoria-metrics-k8s-stack/Chart.lock
index 7f34b6f44..4b9537563 100644
--- a/charts/victoria-metrics-k8s-stack/Chart.lock
+++ b/charts/victoria-metrics-k8s-stack/Chart.lock
@@ -2,7 +2,7 @@ dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.0.10
-- name: victoria-metrics-crds
+- name: crds
   repository: ""
   version: 0.0.*
 - name: victoria-metrics-operator
@@ -20,5 +20,5 @@ dependencies:
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
   version: 11.0.0
-digest: sha256:d09712226054afd08dcb221ac42bf478325f9c506bc78ea0cbdc08fd13ec4d58
-generated: "2024-09-10T06:27:10.930315795Z"
+digest: sha256:6fdb3c9660b219d8832c317f44b83404d8256b4797af21197ab85cad12d29f07
+generated: "2024-09-11T09:25:14.443734+03:00"
diff --git a/charts/victoria-metrics-k8s-stack/Chart.yaml b/charts/victoria-metrics-k8s-stack/Chart.yaml
index a0204f7ce..e031c382b 100644
--- a/charts/victoria-metrics-k8s-stack/Chart.yaml
+++ b/charts/victoria-metrics-k8s-stack/Chart.yaml
@@ -35,9 +35,9 @@ dependencies:
   - name: victoria-metrics-common
     version: "0.0.*"
     repository: https://victoriametrics.github.io/helm-charts
-  - name: victoria-metrics-crds
+  - name: crds
     version: "0.0.*"
-    condition: victoria-metrics-crds.enabled
+    condition: crds.enabled
   - name: victoria-metrics-operator
     version: "0.34.*"
     repository: https://victoriametrics.github.io/helm-charts
diff --git a/charts/victoria-metrics-k8s-stack/charts/crds b/charts/victoria-metrics-k8s-stack/charts/crds
new file mode 120000
index 000000000..ee2719620
--- /dev/null
+++ b/charts/victoria-metrics-k8s-stack/charts/crds
@@ -0,0 +1 @@
+../../victoria-metrics-operator/charts/crds
\ No newline at end of file
diff --git a/charts/victoria-metrics-k8s-stack/charts/victoria-metrics-crds b/charts/victoria-metrics-k8s-stack/charts/victoria-metrics-crds
deleted file mode 120000
index efb25ed0a..000000000
--- a/charts/victoria-metrics-k8s-stack/charts/victoria-metrics-crds
+++ /dev/null
@@ -1 +0,0 @@
-../../victoria-metrics-crds
\ No newline at end of file
diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
index 24908a651..8ef7a29db 100644
--- a/charts/victoria-metrics-k8s-stack/values.yaml
+++ b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -24,7 +24,7 @@ victoria-metrics-operator:
   crd:
     # added temporary till nested chart is not updated
     create: false
-  victoria-metrics-crds:
+  crds:
     # -- we disable crd creation by operator chart as we create them in this chart
     enabled: false
 
@@ -40,6 +40,9 @@ victoria-metrics-operator:
     # -- By default, operator converts prometheus-operator objects.
     disable_prometheus_converter: false
 
+crds:
+  enabled: true
+
 serviceAccount:
   # -- Specifies whether a service account should be created
   create: true
diff --git a/charts/victoria-metrics-operator/Chart.lock b/charts/victoria-metrics-operator/Chart.lock
index 4dcc969f3..17c4c6d12 100644
--- a/charts/victoria-metrics-operator/Chart.lock
+++ b/charts/victoria-metrics-operator/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.9
-- name: victoria-metrics-crds
+  version: 0.0.10
+- name: crds
   repository: ""
   version: 0.0.*
-digest: sha256:95d88c9acc7d8553c96b82c149d31dcec30a3d54fa197c9cfb7905920e27d01f
-generated: "2024-09-09T10:55:25.551646+03:00"
+digest: sha256:86d9756bb19f2d2eb21e119f201b25b6c00f443b0ac2aa6f4d51fb71453d159a
+generated: "2024-09-11T09:25:01.502701+03:00"
diff --git a/charts/victoria-metrics-operator/Chart.yaml b/charts/victoria-metrics-operator/Chart.yaml
index 5faa75531..6735c2cc7 100644
--- a/charts/victoria-metrics-operator/Chart.yaml
+++ b/charts/victoria-metrics-operator/Chart.yaml
@@ -35,6 +35,6 @@ dependencies:
   - name: victoria-metrics-common
     version: "0.0.*"
     repository: https://victoriametrics.github.io/helm-charts
-  - name: victoria-metrics-crds
+  - name: crds
     version: "0.0.*"
-    condition: victoria-metrics-crds.enabled
+    condition: crds.enabled
diff --git a/charts/victoria-metrics-crds/Chart.lock b/charts/victoria-metrics-operator/charts/crds/Chart.lock
similarity index 100%
rename from charts/victoria-metrics-crds/Chart.lock
rename to charts/victoria-metrics-operator/charts/crds/Chart.lock
diff --git a/charts/victoria-metrics-crds/Chart.yaml b/charts/victoria-metrics-operator/charts/crds/Chart.yaml
similarity index 90%
rename from charts/victoria-metrics-crds/Chart.yaml
rename to charts/victoria-metrics-operator/charts/crds/Chart.yaml
index 6d00f6a02..4fb51c099 100644
--- a/charts/victoria-metrics-crds/Chart.yaml
+++ b/charts/victoria-metrics-operator/charts/crds/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: victoria-metrics-crds
+name: crds
 description: A subchart stores victoriametrics operator CRDs
 type: application
 version: 0.0.0
diff --git a/charts/victoria-metrics-operator/charts/crds/charts/victoria-metrics-common-0.0.10.tgz b/charts/victoria-metrics-operator/charts/crds/charts/victoria-metrics-common-0.0.10.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..92e1ceab91feacbb66bad98effd7096dac64d450
GIT binary patch
literal 5692
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

literal 0
HcmV?d00001

diff --git a/charts/victoria-metrics-crds/crds/crd.yaml b/charts/victoria-metrics-operator/charts/crds/crds/crd.yaml
similarity index 100%
rename from charts/victoria-metrics-crds/crds/crd.yaml
rename to charts/victoria-metrics-operator/charts/crds/crds/crd.yaml
diff --git a/charts/victoria-metrics-crds/templates/_helpers.yaml b/charts/victoria-metrics-operator/charts/crds/templates/_helpers.yaml
similarity index 100%
rename from charts/victoria-metrics-crds/templates/_helpers.yaml
rename to charts/victoria-metrics-operator/charts/crds/templates/_helpers.yaml
diff --git a/charts/victoria-metrics-crds/templates/cleanup.yaml b/charts/victoria-metrics-operator/charts/crds/templates/cleanup.yaml
similarity index 100%
rename from charts/victoria-metrics-crds/templates/cleanup.yaml
rename to charts/victoria-metrics-operator/charts/crds/templates/cleanup.yaml
diff --git a/charts/victoria-metrics-crds/values.yaml b/charts/victoria-metrics-operator/charts/crds/values.yaml
similarity index 100%
rename from charts/victoria-metrics-crds/values.yaml
rename to charts/victoria-metrics-operator/charts/crds/values.yaml
diff --git a/charts/victoria-metrics-operator/charts/victoria-metrics-crds b/charts/victoria-metrics-operator/charts/victoria-metrics-crds
deleted file mode 120000
index efb25ed0a..000000000
--- a/charts/victoria-metrics-operator/charts/victoria-metrics-crds
+++ /dev/null
@@ -1 +0,0 @@
-../../victoria-metrics-crds
\ No newline at end of file
diff --git a/charts/victoria-metrics-operator/templates/role.yaml b/charts/victoria-metrics-operator/templates/role.yaml
index 6acf430aa..a9cb28297 100644
--- a/charts/victoria-metrics-operator/templates/role.yaml
+++ b/charts/victoria-metrics-operator/templates/role.yaml
@@ -1,6 +1,6 @@
 {{- $rules := default dict }}
-{{- if hasKey .Subcharts "victoria-metrics-crds" }}
-  {{- $files := index .Subcharts "victoria-metrics-crds" "Files" }}
+{{- if .Subcharts.crds }}
+  {{- $files := .Subcharts.crds.Files }}
   {{- $fileContentsList := $files.Get "crds/crd.yaml" | splitList "---" }}
   {{- $groups := dict }}
   {{- range $fileContentsList }}
@@ -182,7 +182,7 @@ rules:
 {{- end }}
 {{- end }}
 
-{{- if and (index .Values "victoria-metrics-crds" "enabled") .Values.rbac.aggregatedClusterRoles.enabled }}
+{{- if and .Values.crds.enabled .Values.rbac.aggregatedClusterRoles.enabled }}
 {{- /* This template generates readonly and admin cluster roles for */ -}}
 {{- /* each CRD present in the helm chart.  The clusterroles use the */ -}}
 {{- /* kubernetes clusterrole aggregation feature to include these */ -}}
diff --git a/charts/victoria-metrics-operator/values.yaml b/charts/victoria-metrics-operator/values.yaml
index 3dbf3e1e4..daa6032c4 100644
--- a/charts/victoria-metrics-operator/values.yaml
+++ b/charts/victoria-metrics-operator/values.yaml
@@ -22,7 +22,7 @@ image:
   # -- Image pull policy
   pullPolicy: IfNotPresent
 
-victoria-metrics-crds:
+crds:
   # -- enables CRD creation and management.
   # -- with this option, if you remove this chart, all crd resources will be deleted with it.
   enabled: true
diff --git a/hack/helm/victoria-metrics-crds/e2e/simple.yaml b/hack/helm/victoria-metrics-crds/e2e/simple.yaml
deleted file mode 100644
index 4b0b1026b..000000000
--- a/hack/helm/victoria-metrics-crds/e2e/simple.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-cleanup:
-  enabled: true
diff --git a/hack/helm/victoria-metrics-crds/lint/simple.yaml b/hack/helm/victoria-metrics-crds/lint/simple.yaml
deleted file mode 100644
index 4b0b1026b..000000000
--- a/hack/helm/victoria-metrics-crds/lint/simple.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-cleanup:
-  enabled: true