select if CRDs should be rendered as plain or as templates

VictoriaMetrics · Sep 12, 2024 · 623b529 · 623b529
1 parent 0032c23
commit 623b529
Show file tree

Hide file tree

Showing 25 changed files with 96 additions and 30,982 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@
 .DS_Store
 .vscode/
 charts/*/charts/**
-!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/README.md b/charts/victoria-logs-single/README.md
@@ -1,7 +1,7 @@
 
 # Victoria Logs Helm Chart for Single Version
 
- ![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square)
+ ![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-logs-single)
 [![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/)
 
@@ -800,6 +800,16 @@ timeoutSeconds: 5
 </pre>
 </td>
       <td><p>Indicates whether the Container is done with potentially costly initialization. If set it is executed first. If it fails Container is restarted. If it succeeds liveness and readiness probes takes over.</p>
+</td>
+    </tr>
+    <tr>
+      <td>server.replicaCount</td>
+      <td>int</td>
+      <td><pre lang="">
+1
+</pre>
+</td>
+      <td><p>Replica count</p>
 </td>
     </tr>
     <tr>

diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -1,7 +1,7 @@
 
 # Victoria Metrics Helm Chart for Cluster Version
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.13.6](https://img.shields.io/badge/Version-0.13.6-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.13.7](https://img.shields.io/badge/Version-0.13.7-informational?style=flat-square)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-cluster)
 [![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/)
 

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
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Moved crds to a shared chart and import them as a dependency
 
 ## 0.25.16
 

diff --git a/charts/victoria-metrics-k8s-stack/Chart.lock b/charts/victoria-metrics-k8s-stack/Chart.lock
@@ -2,6 +2,9 @@ dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.0.11
+- name: crds
+  repository: ""
+  version: 0.0.*
 - name: victoria-metrics-operator
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.34.8
@@ -14,9 +17,6 @@ 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

diff --git a/charts/victoria-metrics-k8s-stack/Chart.yaml b/charts/victoria-metrics-k8s-stack/Chart.yaml
@@ -35,6 +35,8 @@ dependencies:
   - name: victoria-metrics-common
     version: "0.0.*"
     repository: https://victoriametrics.github.io/helm-charts
+  - name: crds
+    version: "0.0.*"
   - name: victoria-metrics-operator
     version: "0.34.*"
     repository: https://victoriametrics.github.io/helm-charts
@@ -51,9 +53,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
@@ -541,15 +541,6 @@ spec:
       <td><p>spec for VMServiceScrape crd <a href="https://docs.victoriametrics.com/operator/api.html#vmservicescrapespec" target="_blank">https://docs.victoriametrics.com/operator/api.html#vmservicescrapespec</a></p>
 </td>
     </tr>
-    <tr>
-      <td>crds.enabled</td>
-      <td>bool</td>
-      <td><pre lang="">
-true
-</pre>
-</td>
-      <td></td>
-    </tr>
     <tr>
       <td>dashboards</td>
       <td>object</td>
@@ -1897,11 +1888,6 @@ true
       <td>object</td>
       <td><pre lang="plaintext">
 crd:
-    cleanup:
-        enabled: true
-        image:
-            pullPolicy: IfNotPresent
-            repository: bitnami/kubectl
     create: false
 enabled: true
 operator:
@@ -1911,19 +1897,6 @@ serviceMonitor:
 </pre>
 </td>
       <td><p>also checkout here possible ENV variables to configure operator behaviour <a href="https://docs.victoriametrics.com/operator/vars" target="_blank">https://docs.victoriametrics.com/operator/vars</a></p>
-</td>
-    </tr>
-    <tr>
-      <td>victoria-metrics-operator.crd.cleanup</td>
-      <td>object</td>
-      <td><pre lang="plaintext">
-enabled: true
-image:
-    pullPolicy: IfNotPresent
-    repository: bitnami/kubectl
-</pre>
-</td>
-      <td><p>tells helm to clean up vm cr resources when uninstalling</p>
 </td>
     </tr>
     <tr>
@@ -1933,7 +1906,7 @@ image:
 false
 </pre>
 </td>
-      <td><p>we disable crd creation by operator chart as we create them in this chart</p>
+      <td><p>added temporary, till new operator version released</p>
 </td>
     </tr>
     <tr>

diff --git a/charts/victoria-metrics-k8s-stack/charts/crds b/charts/victoria-metrics-k8s-stack/charts/crds
@@ -0,0 +1 @@
+../../victoria-metrics-operator/charts/crds
diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -19,20 +19,11 @@ argocdReleaseOverride: ""
 # -- also checkout here possible ENV variables to configure operator behaviour https://docs.victoriametrics.com/operator/vars
 victoria-metrics-operator:
   enabled: true
-  serviceMonitor:
-    enabled: true
   crd:
-    # -- we disable crd creation by operator chart as we create them in this chart
+    # -- added temporary, till new operator version released
     create: false
-
-    # -- tells helm to clean up vm cr resources when uninstalling
-    cleanup:
-      enabled: true
-      image:
-        repository: bitnami/kubectl
-        # use image tag that matches k8s API version by default
-        # tag: 1.29.6
-        pullPolicy: IfNotPresent
+  serviceMonitor:
+    enabled: true
   operator:
     # -- By default, operator converts prometheus-operator objects.
     disable_prometheus_converter: false
@@ -1211,10 +1202,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
@@ -2,7 +2,8 @@
 
 ## 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.34.8
 

diff --git a/charts/victoria-metrics-operator/Chart.lock b/charts/victoria-metrics-operator/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.9
-digest: sha256:dd59b050d7d15c0fc50f7910f64b45a744bcfc155f2414a8ae300addad5cdbc5
-generated: "2024-09-03T11:58:40.092985+03:00"
+  version: 0.0.11
+- 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
@@ -7,7 +7,7 @@ home: https://github.com/VictoriaMetrics/operator
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
   - https://github.com/VictoriaMetrics/operator
-version: 0.34.8
+version: 0.34.9
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4
 kubeVersion: ">=1.25.0-0"
 keywords:
@@ -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
@@ -1,7 +1,7 @@
 
 # Helm Chart For Victoria Metrics Operator.
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.34.8](https://img.shields.io/badge/Version-0.34.8-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.34.9](https://img.shields.io/badge/Version-0.34.9-informational?style=flat-square)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-operator)
 
 Victoria Metrics Operator
@@ -280,7 +280,7 @@ Fail
 </td>
     </tr>
     <tr>
-      <td>crd.cleanup.enabled</td>
+      <td>crds.cleanup.enabled</td>
       <td>bool</td>
       <td><pre lang="">
 false
@@ -290,7 +290,7 @@ false
 </td>
     </tr>
     <tr>
-      <td>crd.cleanup.image</td>
+      <td>crds.cleanup.image</td>
       <td>object</td>
       <td><pre lang="plaintext">
 pullPolicy: IfNotPresent
@@ -302,13 +302,13 @@ tag: ""
 </td>
     </tr>
     <tr>
-      <td>crd.create</td>
+      <td>crds.plain</td>
       <td>bool</td>
       <td><pre lang="">
-true
+false
 </pre>
 </td>
-      <td><p>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