moved crds to a chart

VictoriaMetrics · Sep 12, 2024 · 8cd3fd9 · 8cd3fd9
1 parent ada45a4
commit 8cd3fd9
Show file tree

Hide file tree

Showing 37 changed files with 129 additions and 31,032 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -127,6 +127,16 @@ jobs:
         with:
           config: .github/ci/cr.yaml
 
+      - name: Release OCI
+        run: |
+          helm registry login \
+            -u ${{ github.actor }} \
+            -p ${{ github.token }} \
+            ghcr.io
+          for package in $(find **/.cr-release-packages -name "*.tgz"); do
+            helm push $package oci://ghcr.io/${{ github.repository_owner }}/charts/;
+          done
+
       - name: Automatic update changelogs and readme
         run: |
           rm charts/*/RELEASE_NOTES.md

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/CHANGELOG.md b/charts/victoria-logs-single/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Next release
 
 - Added ability to override deployment namespace using `namespaceOverride` and `global.namespaceOverride` variables
+- Allow to set replicaCount for a StatefulSet pods
 
 ## 0.6.1
 

diff --git a/charts/victoria-logs-single/Chart.lock b/charts/victoria-logs-single/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 0.46.7
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.10
-digest: sha256:297e416771da041cc4b4a607eccd6128abaf0a81977ff97b30f37b73d956f992
-generated: "2024-09-10T06:09:32.743794014Z"
+  version: 0.0.11
+digest: sha256:9065392de66fea380e81caff20894ff361e462c66461d19a787aec28e2737a1c
+generated: "2024-09-11T08:42:35.510767636Z"
diff --git a/charts/victoria-logs-single/README.md b/charts/victoria-logs-single/README.md
@@ -1031,6 +1031,16 @@ OrderedReady
 </pre>
 </td>
       <td><p>Deploy order policy for StatefulSet pods</p>
+</td>
+    </tr>
+    <tr>
+      <td>server.statefulSet.replicaCount</td>
+      <td>int</td>
+      <td><pre lang="">
+1
+</pre>
+</td>
+      <td><p>Replica count for StatefulSet pods</p>
 </td>
     </tr>
     <tr>

diff --git a/charts/victoria-logs-single/templates/server-statefulset.yaml b/charts/victoria-logs-single/templates/server-statefulset.yaml
@@ -16,7 +16,7 @@ spec:
   serviceName: {{ $fullname }}
   selector:
     matchLabels: {{ include "victoria-logs.server.matchLabels" . | nindent 6 }}
-  replicas: 1
+  replicas: {{ $app.statefulSet.replicaCount }}
   podManagementPolicy: {{ $app.podManagementPolicy }}
   template:
     metadata:

diff --git a/charts/victoria-logs-single/values.yaml b/charts/victoria-logs-single/values.yaml
@@ -260,6 +260,8 @@ server:
     enabled: true
     # -- Deploy order policy for StatefulSet pods
     podManagementPolicy: OrderedReady
+    # -- Replica count for StatefulSet pods
+    replicaCount: 1
   # -- Pod's termination grace period in seconds
   terminationGracePeriodSeconds: 60
   serviceMonitor:

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.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:35.800836709Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:38.233105845Z"
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.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:39.518487503Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:42.019225458Z"
diff --git a/charts/victoria-metrics-anomaly/Chart.lock b/charts/victoria-metrics-anomaly/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:43.531705588Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:45.841739251Z"
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.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:45.576248422Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:47.794209502Z"
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.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:47.574843548Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:49.683584878Z"
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.10
-digest: sha256:94b062240fbfc242acafcd180a5e74ac6ff5d37778af8dcc5e3ff209004e18ed
-generated: "2024-09-10T06:09:49.409038091Z"
+  version: 0.0.11
+digest: sha256:d91f2afa5ae37158f11b1c6601cf8265b08dad62ec4eefd36064b32946e215a6
+generated: "2024-09-11T08:42:51.497355088Z"
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
@@ -1,7 +1,7 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.10
+  version: 0.0.11
 - name: victoria-metrics-operator
   repository: https://victoriametrics.github.io/helm-charts
   version: 0.34.8
@@ -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:a392bf24c36349f4d3cae18d460dbfae13188d4c63c3081870965462c0391f8c
-generated: "2024-09-10T06:09:52.148152592Z"
+digest: sha256:a779df35fb89349f569d8cee18e40fd2e4cd5c1440b06f857b66dde950bf3de9
+generated: "2024-09-12T09:57:51.962449+03:00"
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
@@ -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>
@@ -1896,13 +1887,6 @@ true
       <td>victoria-metrics-operator</td>
       <td>object</td>
       <td><pre lang="plaintext">
-crd:
-    cleanup:
-        enabled: true
-        image:
-            pullPolicy: IfNotPresent
-            repository: bitnami/kubectl
-    create: false
 enabled: true
 operator:
     disable_prometheus_converter: false
@@ -1911,29 +1895,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>
-      <td>victoria-metrics-operator.crd.create</td>
-      <td>bool</td>
-      <td><pre lang="">
-false
-</pre>
-</td>
-      <td><p>we disable crd creation by operator chart as we create them in this chart</p>
 </td>
     </tr>
     <tr>

diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -21,18 +21,6 @@ victoria-metrics-operator:
   enabled: true
   serviceMonitor:
     enabled: true
-  crd:
-    # -- we disable crd creation by operator chart as we create them in this chart
-    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
   operator:
     # -- By default, operator converts prometheus-operator objects.
     disable_prometheus_converter: false
@@ -1211,10 +1199,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.*` properties to `crds.*` as they now belong to a subchart
 
 ## 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.10
+- name: crds
+  repository: ""
+  version: 0.0.*
+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
@@ -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.enabled
diff --git a/charts/victoria-metrics-operator/README.md b/charts/victoria-metrics-operator/README.md
@@ -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,7 +302,7 @@ tag: ""
 </td>
     </tr>
     <tr>
-      <td>crd.create</td>
+      <td>crds.enabled</td>
       <td>bool</td>
       <td><pre lang="">
 true

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