From bf437b9cc3cf9ea55e8f010c65e41346356f546b Mon Sep 17 00:00:00 2001 From: Prateek Pandey Date: Fri, 3 Sep 2021 14:07:35 +0530 Subject: [PATCH] chore(helm): bump csi sidecars and add storagecapacity in csidriver (#377) Signed-off-by: prateekpandey14 --- deploy/helm/charts/Chart.yaml | 2 +- deploy/helm/charts/README.md | 6 +++--- deploy/helm/charts/templates/csidriver.yaml | 1 + deploy/helm/charts/templates/zfs-contoller.yaml | 9 +++++++++ deploy/helm/charts/values.yaml | 10 +++++++--- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml index 893e7ac94..9965ed639 100644 --- a/deploy/helm/charts/Chart.yaml +++ b/deploy/helm/charts/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: zfs-localpv 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/ -version: 1.9.4 +version: 1.9.5 appVersion: 1.9.1 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png home: http://www.openebs.io/ diff --git a/deploy/helm/charts/README.md b/deploy/helm/charts/README.md index 995c2a145..71569307f 100644 --- a/deploy/helm/charts/README.md +++ b/deploy/helm/charts/README.md @@ -82,7 +82,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv | `zfsNode.driverRegistrar.image.registry`| Registry for csi-node-driver-registrar image| `k8s.gcr.io/`| | `zfsNode.driverRegistrar.image.repository`| Image repository for csi-node-driver-registrar| `sig-storage/csi-node-driver-registrar`| | `zfsNode.driverRegistrar.image.pullPolicy`| Image pull policy for csi-node-driver-registrar| `IfNotPresent`| -| `zfsNode.driverRegistrar.image.tag`| Image tag for csi-node-driver-registrar| `v1.2.0`| +| `zfsNode.driverRegistrar.image.tag`| Image tag for csi-node-driver-registrar| `v2.3.0`| | `zfsNode.updateStrategy.type`| Update strategy for zfsnode daemonset | `RollingUpdate` | | `zfsNode.kubeletDir`| Kubelet mount point for zfsnode daemonset| `"/var/lib/kubelet/"` | | `zfsNode.annotations` | Annotations for zfsnode daemonset metadata| `""`| @@ -96,7 +96,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv | `zfsController.resizer.image.registry`| Registry for csi-resizer image| `k8s.gcr.io/`| | `zfsController.resizer.image.repository`| Image repository for csi-resizer| `sig-storage/csi-resizer`| | `zfsController.resizer.image.pullPolicy`| Image pull policy for csi-resizer| `IfNotPresent`| -| `zfsController.resizer.image.tag`| Image tag for csi-resizer| `v1.1.0`| +| `zfsController.resizer.image.tag`| Image tag for csi-resizer| `v1.2.0`| | `zfsController.snapshotter.image.registry`| Registry for csi-snapshotter image| `k8s.gcr.io/`| | `zfsController.snapshotter.image.repository`| Image repository for csi-snapshotter| `sig-storage/csi-snapshotter`| | `zfsController.snapshotter.image.pullPolicy`| Image pull policy for csi-snapshotter| `IfNotPresent`| @@ -108,7 +108,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv | `zfsController.provisioner.image.registry`| Registry for csi-provisioner image| `k8s.gcr.io/`| | `zfsController.provisioner.image.repository`| Image repository for csi-provisioner| `sig-storage/csi-provisioner`| | `zfsController.provisioner.image.pullPolicy`| Image pull policy for csi-provisioner| `IfNotPresent`| -| `zfsController.provisioner.image.tag`| Image tag for csi-provisioner| `v2.1.0`| +| `zfsController.provisioner.image.tag`| Image tag for csi-provisioner| `v3.0.0`| | `zfsController.updateStrategy.type`| Update strategy for zfs localpv controller statefulset | `RollingUpdate` | | `zfsController.annotations` | Annotations for zfs localpv controller statefulset metadata| `""`| | `zfsController.podAnnotations`| Annotations for zfs localpv controller statefulset's pods metadata | `""`| diff --git a/deploy/helm/charts/templates/csidriver.yaml b/deploy/helm/charts/templates/csidriver.yaml index a33cbb801..c14b14640 100644 --- a/deploy/helm/charts/templates/csidriver.yaml +++ b/deploy/helm/charts/templates/csidriver.yaml @@ -7,3 +7,4 @@ spec: # do not require volumeattachment attachRequired: false podInfoOnMount: false + storageCapacity: {{ .Values.feature.storageCapacity }} diff --git a/deploy/helm/charts/templates/zfs-contoller.yaml b/deploy/helm/charts/templates/zfs-contoller.yaml index 82129ed6f..a0dd7c370 100644 --- a/deploy/helm/charts/templates/zfs-contoller.yaml +++ b/deploy/helm/charts/templates/zfs-contoller.yaml @@ -79,11 +79,20 @@ spec: - "--feature-gates=Topology=true" - "--strict-topology" - "--leader-election" + - "--enable-capacity={{ .Values.feature.storageCapacity }}" - "--extra-create-metadata=true" - "--default-fstype=ext4" env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml index be805e59d..284818d35 100644 --- a/deploy/helm/charts/values.yaml +++ b/deploy/helm/charts/values.yaml @@ -7,6 +7,10 @@ release: imagePullSecrets: # - name: "image-pull-secret" +feature: + # enable storage capacity tracking feature + # Ref: https://kubernetes:io/docs/concepts/storage/storage-capacity + storageCapacity: true rbac: # rbac.pspEnabled: `true` if PodSecurityPolicy resources should be created @@ -25,7 +29,7 @@ zfsNode: repository: sig-storage/csi-node-driver-registrar pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v2.1.0 + tag: v2.3.0 updateStrategy: type: RollingUpdate annotations: {} @@ -65,7 +69,7 @@ zfsController: repository: sig-storage/csi-resizer pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v1.1.0 + tag: v1.2.0 snapshotter: name: "csi-snapshotter" image: @@ -95,7 +99,7 @@ zfsController: repository: sig-storage/csi-provisioner pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v2.1.0 + tag: v3.0.0 updateStrategy: type: RollingUpdate annotations: {}