[CI] Helm Chart Update zfs-localpv

Obmondo · Sep 23, 2024 · 1dc0702 · 1dc0702
1 parent f815a6f
commit 1dc0702
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ All releases and the changes included in them (pulled from git commits added sin
 - Updated argo-cd from version 7.5.2 to 7.6.1
 
 ### Patch Version Upgrades %%^^
+- Updated zfs-localpv from version 2.6.0 to 2.6.1
 - Updated tigera-operator from version v3.28.1 to v3.28.2
 - Updated rook-ceph-cluster from version v1.15.1 to v1.15.2
 - Updated rook-ceph from version v1.15.1 to v1.15.2

diff --git a/argocd-helm-charts/zfs-localpv/Chart.lock b/argocd-helm-charts/zfs-localpv/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: zfs-localpv
   repository: https://openebs.github.io/zfs-localpv
-  version: 2.6.0
-digest: sha256:33234dea11a6d19c30b0c2032b7744f735b032c16f5255c46932d3ce2878dbe5
-generated: "2024-07-09T02:59:29.416536221+05:30"
+  version: 2.6.1
+digest: sha256:01fbd0a29b37dce407f710733635d6e405e0d73db6a0cf97e84bd18eb560924a
+generated: "2024-09-23T13:27:33.276732537+05:30"
diff --git a/argocd-helm-charts/zfs-localpv/Chart.yaml b/argocd-helm-charts/zfs-localpv/Chart.yaml
@@ -3,5 +3,5 @@ name: zfs-localpv
 version: 1.0.0
 dependencies:
   - name: zfs-localpv
-    version: 2.6.0
+    version: 2.6.1
     repository: https://openebs.github.io/zfs-localpv
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/Chart.lock b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: crds
   repository: ""
-  version: 2.6.0
-digest: sha256:7a4c1d2902944b77c393fdbeae226b561ee796cbb7d0c0801b4d87b6eefe55bd
-generated: "2024-07-05T10:37:20.723199712Z"
+  version: 2.6.1
+digest: sha256:c15793c0b73324ebfe559cbc0e6ef2f30b52654273a98d475d9e9dbb247531f4
+generated: "2024-09-17T06:40:48.982035939Z"
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/Chart.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 2.6.0
+appVersion: 2.6.1
 dependencies:
 - condition: crds.enabled
   name: crds
   repository: ""
-  version: 2.6.0
+  version: 2.6.1
 description: Helm chart for CSI Driver for dynamic provisioning of ZFS Persistent
   Local Volumes. For instructions on how to use this helm chart, see - https://openebs.github.io/zfs-localpv/
 home: https://openebs.io/
@@ -19,4 +19,4 @@ keywords:
 name: zfs-localpv
 sources:
 - https://github.com/openebs/zfs-localpv
-version: 2.6.0
+version: 2.6.1
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/README.md b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/README.md
@@ -69,7 +69,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv
 | `zfsPlugin.image.registry`| Registry for openebs-zfs-plugin image| `""`|
 | `zfsPlugin.image.repository`| Image repository for openebs-zfs-plugin| `openebs/zfs-driver`|
 | `zfsPlugin.image.pullPolicy`| Image pull policy for openebs-zfs-plugin| `IfNotPresent`|
-| `zfsPlugin.image.tag`| Image tag for openebs-zfs-plugin| `2.6.0`|
+| `zfsPlugin.image.tag`| Image tag for openebs-zfs-plugin| `2.6.1-prerelease`|
 | `zfsNode.allowedTopologyKeys`| Custom topology keys required for provisioning| `"kubernetes.io/hostname,"`|
 | `zfsNode.driverRegistrar.image.registry`| Registry for csi-node-driver-registrar image| `registry.k8s.io/`|
 | `zfsNode.driverRegistrar.image.repository`| Image repository for csi-node-driver-registrar| `sig-storage/csi-node-driver-registrar`|

diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/Chart.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 description: A Helm chart that collects CustomResourceDefinitions (CRDs) from zfs-localpv.
 name: crds
-version: 2.6.0
+version: 2.6.1
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/_helpers.tpl b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/_helpers.tpl
@@ -16,4 +16,4 @@ helm.sh/resource-policy: keep
 {{- with .annotations }}
   {{- toYaml . }}
 {{- end }}
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsbackup.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsbackup.yaml
@@ -1,13 +1,4 @@
 {{- if .Values.zfsLocalPv.enabled -}}
-##############################################
-###########                       ############
-###########   ZFSBackup CRD       ############
-###########                       ############
-##############################################
-
-# ZFSBackups CRD is autogenerated via `make manifests` command.
-# Do the modification in the code and run the `make manifests` command
-# to generate the CRD definition
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -114,4 +105,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsnode.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsnode.yaml
@@ -1,13 +1,4 @@
 {{- if .Values.zfsLocalPv.enabled -}}
-##############################################
-###########                       ############
-###########     ZFSNode CRD       ############
-###########                       ############
-##############################################
-
-# ZFSNode CRD is autogenerated via `make manifests` command.
-# Do the modification in the code and run the `make manifests` command
-# to generate the CRD definition
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -61,25 +52,25 @@ spec:
                   description: Free specifies the available capacity of zfs pool.
                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                   x-kubernetes-int-or-string: true
+                name:
+                  description: Name of the zfs pool.
+                  minLength: 1
+                  type: string
                 used:
                   anyOf:
                   - type: integer
                   - type: string
                   description: Used specifies the used capacity of zfs pool.
                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                   x-kubernetes-int-or-string: true
-                name:
-                  description: Name of the zfs pool.
-                  minLength: 1
-                  type: string
                 uuid:
                   description: UUID denotes a unique identity of a zfs pool.
                   minLength: 1
                   type: string
               required:
               - free
-              - used
               - name
+              - used
               - uuid
               type: object
             type: array
@@ -94,4 +85,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsrestore.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsrestore.yaml
@@ -1,13 +1,4 @@
 {{- if .Values.zfsLocalPv.enabled -}}
-##############################################
-###########                       ############
-###########   ZFSRestore CRD      ############
-###########                       ############
-##############################################
-
-# ZFSRestores CRD is autogenerated via `make manifests` command.
-# Do the modification in the code and run the `make manifests` command
-# to generate the CRD definition
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -236,4 +227,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfssnapshot.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfssnapshot.yaml
@@ -1,13 +1,4 @@
 {{- if .Values.zfsLocalPv.enabled -}}
-##############################################
-###########                       ############
-###########   ZFSSnapshot CRD     ############
-###########                       ############
-##############################################
-
-# ZFSSnapshot CRD is autogenerated via `make manifests` command.
-# Do the modification in the code and run the `make manifests` command
-# to generate the CRD definition
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -381,4 +372,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsvolume.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/charts/crds/templates/zfsvolume.yaml
@@ -1,13 +1,4 @@
 {{- if .Values.zfsLocalPv.enabled -}}
-##############################################
-###########                       ############
-###########   ZFSVolume CRD       ############
-###########                       ############
-##############################################
-
-# ZFSVolume CRD is autogenerated via `make manifests` command.
-# Do the modification in the code and run the `make manifests` command
-# to generate the CRD definition
 
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -447,4 +438,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
+{{- end -}}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/_helpers.tpl b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/_helpers.tpl
@@ -58,9 +58,11 @@ Create the name of the service account to use
 Define meta labels for openebs zfs-localpv components
 */}}
 {{- define "zfslocalpv.common.metaLabels" -}}
+{{- if or (not (hasKey .Values "enableHelmMetaLabels")) .Values.enableHelmMetaLabels -}}
 chart: {{ template "zfslocalpv.chart" . }}
 heritage: {{ .Release.Service }}
-openebs.io/version: {{ .Values.release.version | quote }}
+{{ end -}}
+openebs.io/version: {{ .Chart.AppVersion | quote }}
 role: {{ .Values.role | quote }}
 {{- end -}}
 
@@ -69,7 +71,9 @@ Create match labels for openebs zfs-localpv controller
 */}}
 {{- define "zfslocalpv.zfsController.matchLabels" -}}
 app: {{ .Values.zfsController.componentName | quote }}
+{{ if or (not (hasKey .Values "enableHelmMetaLabels")) .Values.enableHelmMetaLabels -}}
 release: {{ .Release.Name }}
+{{ end -}}
 component: {{ .Values.zfsController.componentName | quote }}
 {{- end -}}
 
@@ -94,9 +98,10 @@ Create labels for openebs zfs-localpv controller
 Create match labels for openebs zfs-localpv node daemon
 */}}
 {{- define "zfslocalpv.zfsNode.matchLabels" -}}
-name: {{ .Values.zfsNode.componentName | quote }}
+name: {{ .Values.zfsNode.componentName | quote }}{{ if or (not (hasKey .Values "enableHelmMetaLabels")) .Values.enableHelmMetaLabels }}
 release: {{ .Release.Name }}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Create component labels openebs zfs-localpv node daemon
@@ -146,11 +151,4 @@ Enable zfsController containers leader election if replicas > 1
 - "--leader-election"
 {{- end }}
 {{- end }}
-{{- end }}
-
-{{/*
-Ensure that the path to kubelet ends with a slash
-*/}}
-{{- define "zfslocalpv.zfsNode.kubeletDir" -}}
-{{- printf "%s/" (.Values.zfsNode.kubeletDir | trimSuffix "/") -}}
-{{- end }}
+{{- end }}
diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/zfs-controller.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/zfs-controller.yaml
@@ -24,6 +24,16 @@ spec:
         {{ toYaml . | nindent 8 }}
         {{- end}}
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - openebs-zfs-controller
+            topologyKey: "kubernetes.io/hostname"
 {{- if .Values.zfsController.priorityClass.create }}
       priorityClassName: {{ template "zfslocalpv.zfsController.priorityClassName" . }}
 {{- end }}
@@ -118,9 +128,17 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: OPENEBS_IO_INSTALLER_TYPE
-              value: "zfs-localpv-helm"
+              value: "{{ if (not (hasKey .Values.analytics "installerType")) }}zfs-localpv-helm{{ else }}{{ .Values.analytics.installerType }}{{ end }}"
             - name: OPENEBS_IO_ENABLE_ANALYTICS
               value: "{{ .Values.analytics.enabled }}"
+            {{- if .Values.analytics.gaId }}
+            - name: GA_ID
+              value: {{ .Values.analytics.gaId | quote }}
+            {{- end }}
+            {{- if .Values.analytics.gaKey }}
+            - name: GA_KEY
+              value: {{ .Values.analytics.gaKey | quote }}
+            {{- end }}
           args :
             - "--endpoint=$(OPENEBS_CSI_ENDPOINT)"
             - "--plugin=$(OPENEBS_CONTROLLER_DRIVER)"

diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/zfs-node.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/templates/zfs-node.yaml
@@ -55,7 +55,7 @@ spec:
             - name: ADDRESS
               value: /plugin/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins/zfs-localpv/csi.sock" | quote }}
+              value: {{ .Values.zfsNode.kubeletDir }}plugins/zfs-localpv/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -107,7 +107,7 @@ spec:
               mountPropagation: "HostToContainer"
               readOnly: true
             - name: pods-mount-dir
-              mountPath: {{ include "zfslocalpv.zfsNode.kubeletDir" . | quote }}
+              mountPath: {{ .Values.zfsNode.kubeletDir }}
               # needed so that any mounts setup inside this container are
               # propagated back to the host machine.
               mountPropagation: "Bidirectional"
@@ -130,15 +130,15 @@ spec:
             type: Directory
         - name: registration-dir
           hostPath:
-            path: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins_registry/" | quote }}
+            path: {{ .Values.zfsNode.kubeletDir }}plugins_registry/
             type: DirectoryOrCreate
         - name: plugin-dir
           hostPath:
-            path: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins/zfs-localpv/" | quote }}
+            path: {{ .Values.zfsNode.kubeletDir }}plugins/zfs-localpv/
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
-            path: {{ include "zfslocalpv.zfsNode.kubeletDir" . | quote }}
+            path: {{ .Values.zfsNode.kubeletDir }}
             type: Directory
 {{- if .Values.zfsNode.additionalVolumes }}
 {{- range $name, $config := .Values.zfsNode.additionalVolumes }}

diff --git a/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/values.yaml b/argocd-helm-charts/zfs-localpv/charts/zfs-localpv/values.yaml
@@ -1,9 +1,6 @@
 # Default values for openebs-zfslocalpv.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-release:
-  version: "2.6.0"
-
 imagePullSecrets:
 # - name: "image-pull-secret"
 
@@ -146,7 +143,7 @@ zfsPlugin:
     repository: openebs/zfs-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 2.6.0
+    tag: 2.6.1
 
 role: openebs-zfs
 
@@ -166,6 +163,7 @@ serviceAccount:
 
 analytics:
   enabled: true
+  installerType: "zfs-localpv-helm"
 zfs:
   # If you use a non-standard path to the zfs binary, specify it here
   # bin: /run/current-system/sw/bin/zfs
@@ -179,3 +177,7 @@ crds:
     volumeSnapshots:
       # Install Volume Snapshot CRDs
       enabled: true
+
+# Allows adding helm specific labels to the components.
+# Only useful for generating independent templates from helm.
+enableHelmMetaLabels: true