select if CRDs should be rendered as plain or as templates

VictoriaMetrics · Oct 4, 2024 · 07d5330 · 07d5330
1 parent 9474517
commit 07d5330
Show file tree

Hide file tree

Showing 28 changed files with 97 additions and 31,806 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,8 @@
 charts/*/charts/**
 .cr-release-packages
 .cr-release-packages/**
-!charts/victoria-metrics-k8s-stack/charts/crds
-!charts/victoria-metrics-k8s-stack/charts/crds/**
+!charts/*/charts/crds
+!charts/*/charts/crds/**
 .helm/
 .local/
 tmp/
diff --git a/charts/victoria-logs-single/Chart.lock b/charts/victoria-logs-single/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: fluent-bit
   repository: https://fluent.github.io/helm-charts
-  version: 0.47.9
+  version: 0.47.10
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.0.13
-digest: sha256:929e113abbf3afeb266bad969ae0e815de005de3b3eb04148a1ad0bc6d5b5e39
-generated: "2024-09-23T17:20:31.247018+03:00"
+digest: sha256:a0b86cf86bea687fa024d5b73771e72f964ec8501e28e8729b9e1be4eb269e06
+generated: "2024-10-04T05:49:43.00143096Z"
diff --git a/charts/victoria-metrics-agent/Chart.lock b/charts/victoria-metrics-agent/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.11
-digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
-generated: "2024-09-12T11:50:35.502691843Z"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-10-04T05:49:45.869316503Z"
diff --git a/charts/victoria-metrics-alert/Chart.lock b/charts/victoria-metrics-alert/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.11
-digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
-generated: "2024-09-12T11:50:39.261032678Z"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-10-04T05:49:49.668909755Z"
diff --git a/charts/victoria-metrics-auth/Chart.lock b/charts/victoria-metrics-auth/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.11
-digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
-generated: "2024-09-12T11:50:45.212388959Z"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-10-04T05:49:55.509039341Z"
diff --git a/charts/victoria-metrics-cluster/Chart.lock b/charts/victoria-metrics-cluster/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.12
-digest: sha256:97dec3ff63bad192d582b7db6aad9cc817094ec7d7c9cb07e40d32fcccd4bc56
-generated: "2024-09-16T11:17:25.971536+03:00"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-10-04T05:49:57.385550342Z"
diff --git a/charts/victoria-metrics-gateway/Chart.lock b/charts/victoria-metrics-gateway/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.11
-digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
-generated: "2024-09-12T11:50:49.115872835Z"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-10-04T05:49:59.296319676Z"
diff --git a/charts/victoria-metrics-k8s-stack/.gitignore b/charts/victoria-metrics-k8s-stack/.gitignore
diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Moved crds to a shared chart and import them as a dependency
 
 ## 0.27.0
 

diff --git a/charts/victoria-metrics-k8s-stack/Chart.lock b/charts/victoria-metrics-k8s-stack/Chart.lock
@@ -14,11 +14,8 @@ dependencies:
 - name: grafana
   repository: https://grafana.github.io/helm-charts
   version: 8.4.9
-- name: crds
-  repository: ""
-  version: 0.0.0
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
   version: 11.0.0
-digest: sha256:1f342f63fd8888bff660fc2fe2cd39cccaf626c1c6d729008734192070b81449
-generated: "2024-09-30T00:52:14.142704+02:00"
+digest: sha256:22118e37e481c36e00ed42621f11f3678a759493cfe3bf995a6cef6077f12a0a
+generated: "2024-10-04T06:13:36.78032043Z"
diff --git a/charts/victoria-metrics-k8s-stack/Chart.yaml b/charts/victoria-metrics-k8s-stack/Chart.yaml
@@ -51,9 +51,6 @@ dependencies:
     version: "8.4.*"
     repository: https://grafana.github.io/helm-charts
     condition: grafana.enabled
-  - name: crds
-    version: "0.0.0"
-    condition: crds.enabled
   - name: prometheus-operator-crds
     version: "11.0.*"
     repository: https://prometheus-community.github.io/helm-charts

diff --git a/charts/victoria-metrics-k8s-stack/README.md b/charts/victoria-metrics-k8s-stack/README.md
@@ -607,17 +607,6 @@ selectAllByDefault: true
 </pre>
 </td>
       <td><p>Spec for VMServiceScrape CRD is <a href="https://docs.victoriametrics.com/operator/api.html#vmservicescrapespec" target="_blank">here</a></p>
-</td>
-    </tr>
-    <tr>
-      <td>crds</td>
-      <td>object</td>
-      <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">enabled: true
-</code>
-</pre>
-</td>
-      <td><p>Install VM operator CRDs</p>
 </td>
     </tr>
     <tr>
@@ -2076,11 +2065,6 @@ selector:
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">crd:
-    cleanup:
-        enabled: true
-        image:
-            pullPolicy: IfNotPresent
-            repository: bitnami/kubectl
     create: false
 enabled: true
 operator:
@@ -2091,6 +2075,17 @@ serviceMonitor:
 </pre>
 </td>
       <td><p>VictoriaMetrics Operator dependency chart configuration. More values can be found <a href="https://docs.victoriametrics.com/helm/victoriametrics-operator#parameters" target="_blank">here</a>. Also checkout <a href="https://docs.victoriametrics.com/operator/vars" target="_blank">here</a> possible ENV variables to configure operator behaviour</p>
+</td>
+    </tr>
+    <tr>
+      <td>victoria-metrics-operator.crd.create</td>
+      <td>bool</td>
+      <td><pre class="helm-vars-default-value" language-yaml" lang="">
+<code class="language-yaml">false
+</code>
+</pre>
+</td>
+      <td><p>added temporary, till new operator version released</p>
 </td>
     </tr>
     <tr>

diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -22,15 +22,11 @@ argocdReleaseOverride: ""
 # -- VictoriaMetrics Operator dependency chart configuration. More values can be found [here](https://docs.victoriametrics.com/helm/victoriametrics-operator#parameters). Also checkout [here](https://docs.victoriametrics.com/operator/vars) possible ENV variables to configure operator behaviour
 victoria-metrics-operator:
   enabled: true
-  serviceMonitor:
-    enabled: true
   crd:
+    # -- added temporary, till new operator version released
     create: false
-    cleanup:
-      enabled: true
-      image:
-        repository: bitnami/kubectl
-        pullPolicy: IfNotPresent
+  serviceMonitor:
+    enabled: true
   operator:
     # -- By default, operator converts prometheus-operator objects.
     disable_prometheus_converter: false
@@ -1224,10 +1220,6 @@ kubeProxy:
           tlsConfig:
             caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
 
-# --  Install VM operator CRDs
-crds:
-  enabled: true
-
 # -- Install prometheus operator CRDs
 prometheus-operator-crds:
   enabled: false

diff --git a/charts/victoria-metrics-operator/CHANGELOG.md b/charts/victoria-metrics-operator/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next release
 
-- TODO
+- Moved crds to a shared chart and import them as a dependency
+- replaced `crd.enabled` property to `crds.plain`. Instead of disabling CRDs it selects if CRDs should be rendered from template or as plain CRDs
 
 ## 0.35.2
 

diff --git a/charts/victoria-metrics-operator/Chart.lock b/charts/victoria-metrics-operator/Chart.lock
@@ -2,5 +2,8 @@ dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.0.13
-digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
-generated: "2024-09-17T00:20:51.436479+03:00"
+- name: crds
+  repository: ""
+  version: 0.0.*
+digest: sha256:14667a2da4b0843956aa57c97b737fbefc3bd24f0376f81b2c2b7e84919e5214
+generated: "2024-09-12T13:21:35.804808+03:00"
diff --git a/charts/victoria-metrics-operator/Chart.yaml b/charts/victoria-metrics-operator/Chart.yaml
@@ -35,3 +35,6 @@ dependencies:
   - name: victoria-metrics-common
     version: '0.0.*'
     repository: https://victoriametrics.github.io/helm-charts
+  - name: crds
+    version: "0.0.*"
+    condition: crds.plain
diff --git a/charts/victoria-metrics-operator/README.md b/charts/victoria-metrics-operator/README.md
@@ -311,7 +311,7 @@ issuer: {}
 </td>
     </tr>
     <tr>
-      <td>crd.cleanup.enabled</td>
+      <td>crds.cleanup.enabled</td>
       <td>bool</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="">
 <code class="language-yaml">false
@@ -322,7 +322,7 @@ issuer: {}
 </td>
     </tr>
     <tr>
-      <td>crd.cleanup.image</td>
+      <td>crds.cleanup.image</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">pullPolicy: IfNotPresent
@@ -335,14 +335,14 @@ tag: ""
 </td>
     </tr>
     <tr>
-      <td>crd.create</td>
+      <td>crds.plain</td>
       <td>bool</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="">
-<code class="language-yaml">true
+<code class="language-yaml">false
 </code>
 </pre>
 </td>
-      <td><p>Enables CRD creation and management. With this option, if you remove this chart, all CRD resources will be deleted with it.</p>
+      <td><p>check if plain or templated CRDs should be created. with this option set to <code>false</code>, all CRDs will be rendered from templates. with this option set to <code>true</code>, all CRDs are immutable and require manual upgrade.</p>
 </td>
     </tr>
     <tr>

diff --git a/...-metrics-k8s-stack/charts/crds/Chart.yaml → ...a-metrics-operator/charts/crds/Chart.yaml b/...-metrics-k8s-stack/charts/crds/Chart.yaml → ...a-metrics-operator/charts/crds/Chart.yaml
@@ -1,8 +1,6 @@
 apiVersion: v2
 name: crds
-description: A subchart stores victoriametrics operator crd.
+description: A subchart stores victoriametrics operator CRDs
 type: application
-
 version: 0.0.0
-
 appVersion: "0.0.0"
diff --git a/...trics-k8s-stack/charts/crds/crds/crd.yaml → ...etrics-operator/charts/crds/crds/crd.yaml b/...trics-k8s-stack/charts/crds/crds/crd.yaml → ...etrics-operator/charts/crds/crds/crd.yaml