From 11a1034b0a636cec9abb1072edbca22b30c1998a Mon Sep 17 00:00:00 2001 From: Shubham Bajpai Date: Mon, 15 Feb 2021 17:31:31 +0530 Subject: [PATCH] [stable/zfs-localpv]: update charts to 1.4.0 (#285) - update chart version - update README - update values.yaml Signed-off-by: shubham --- deploy/helm/charts/Chart.yaml | 4 +-- deploy/helm/charts/README.md | 30 ++++++++++----------- deploy/helm/charts/templates/psp.yaml | 5 +--- deploy/helm/charts/templates/rbac.yaml | 33 +++++++++++++++++++++++ deploy/helm/charts/values.yaml | 36 +++++++++++++------------- 5 files changed, 69 insertions(+), 39 deletions(-) diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml index ff4a39f..be91ef1 100644 --- a/deploy/helm/charts/Chart.yaml +++ b/deploy/helm/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: zfs-localpv description: CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes. -version: 1.3.1 -appVersion: 1.3.0 +version: 1.4.0 +appVersion: 1.4.0 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png home: http://www.openebs.io/ keywords: diff --git a/deploy/helm/charts/README.md b/deploy/helm/charts/README.md index 37c37a9..dd91fb5 100644 --- a/deploy/helm/charts/README.md +++ b/deploy/helm/charts/README.md @@ -78,9 +78,9 @@ 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| `1.3.0`| -| `zfsNode.driverRegistrar.image.registry`| Registry for csi-node-driver-registrar image| `quay.io/`| -| `zfsNode.driverRegistrar.image.repository`| Image repository for csi-node-driver-registrar| `k8scsi/csi-node-driver-registrar`| +| `zfsPlugin.image.tag`| Image tag for openebs-zfs-plugin| `1.4.0`| +| `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.updateStrategy.type`| Update strategy for zfsnode daemonset | `RollingUpdate` | @@ -93,22 +93,22 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv | `zfsNode.nodeSelector`| Nodeselector for zfsnode daemonset pods| `""`| | `zfsNode.tolerations` | zfsnode daemonset's pod toleration values | `""`| | `zfsNode.securityContext` | Seurity context for zfsnode daemonset container | `""`| -| `zfsController.resizer.image.registry`| Registry for csi-resizer image| `quay.io/`| -| `zfsController.resizer.image.repository`| Image repository for csi-resizer| `k8scsi/csi-resizer`| +| `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| `v0.4.0`| -| `zfsController.snapshotter.image.registry`| Registry for csi-snapshotter image| `quay.io/`| -| `zfsController.snapshotter.image.repository`| Image repository for csi-snapshotter| `k8scsi/csi-snapshotter`| +| `zfsController.resizer.image.tag`| Image tag for csi-resizer| `v1.1.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`| -| `zfsController.snapshotter.image.tag`| Image tag for csi-snapshotter| `v2.0.1`| -| `zfsController.snapshotController.image.registry`| Registry for snapshot-controller image| `quay.io/`| -| `zfsController.snapshotController.image.repository`| Image repository for snapshot-controller| `k8scsi/snapshot-controller`| +| `zfsController.snapshotter.image.tag`| Image tag for csi-snapshotter| `v4.0.0`| +| `zfsController.snapshotController.image.registry`| Registry for snapshot-controller image| `k8s.gcr.io/`| +| `zfsController.snapshotController.image.repository`| Image repository for snapshot-controller| `sig-storage/snapshot-controller`| | `zfsController.snapshotController.image.pullPolicy`| Image pull policy for snapshot-controller| `IfNotPresent`| -| `zfsController.snapshotController.image.tag`| Image tag for snapshot-controller| `v2.0.1`| -| `zfsController.provisioner.image.registry`| Registry for csi-provisioner image| `quay.io/`| -| `zfsController.provisioner.image.repository`| Image repository for csi-provisioner| `k8scsi/csi-provisioner`| +| `zfsController.snapshotController.image.tag`| Image tag for snapshot-controller| `v4.0.0`| +| `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| `v1.6.0`| +| `zfsController.provisioner.image.tag`| Image tag for csi-provisioner| `v2.1.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/psp.yaml b/deploy/helm/charts/templates/psp.yaml index 90313b5..33be4dc 100644 --- a/deploy/helm/charts/templates/psp.yaml +++ b/deploy/helm/charts/templates/psp.yaml @@ -2,10 +2,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "zfslocalpv.fullname" . }}-psp - {{- with .Values.zfsNode.annotations }} - annotations: {{ toYaml . | nindent 4 }} - {{- end }} + name: openebs-zfs-node-psp labels: {{- include "zfslocalpv.zfsNode.labels" . | nindent 4 }} spec: diff --git a/deploy/helm/charts/templates/rbac.yaml b/deploy/helm/charts/templates/rbac.yaml index d0a3cb2..13ea0d5 100644 --- a/deploy/helm/charts/templates/rbac.yaml +++ b/deploy/helm/charts/templates/rbac.yaml @@ -44,6 +44,9 @@ rules: - apiGroups: [""] resources: ["pods"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "watch", "update", "patch"] - apiGroups: ["*"] resources: ["zfsvolumes", "zfssnapshots", "zfsbackups", "zfsrestores"] verbs: ["*"] @@ -160,5 +163,35 @@ roleRef: kind: ClusterRole name: openebs-zfs-driver-registrar-role apiGroup: rbac.authorization.k8s.io + +{{- if .Values.rbac.pspEnabled }} --- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: openebs-zfs-node-role + labels: + {{- include "zfslocalpv.zfsNode.labels" . | nindent 4 }} +rules: +- apiGroups: ['policy'] + resources: ['podsecuritypolicies'] + verbs: ['use'] + resourceNames: + - openebs-zfs-node-psp +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: openebs-zfs-node-binding + labels: + {{- include "zfslocalpv.zfsNode.labels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: openebs-zfs-node-role +subjects: + - kind: ServiceAccount + name: {{ .Values.serviceAccount.zfsNode.name }} + namespace: {{ $.Release.Namespace }} +{{- end }} {{- end }} diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml index c123554..56ad96d 100644 --- a/deploy/helm/charts/values.yaml +++ b/deploy/helm/charts/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. release: - version: "1.3.0" + version: "1.4.0" imagePullSecrets: # - name: "image-pull-secret" @@ -20,9 +20,9 @@ zfsNode: name: "csi-node-driver-registrar" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect - registry: quay.io/ - repository: k8scsi/csi-node-driver-registrar + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect + registry: k8s.gcr.io/ + repository: sig-storage/csi-node-driver-registrar pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v2.1.0 @@ -58,9 +58,9 @@ zfsController: name: "csi-resizer" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect - registry: quay.io/ - repository: k8scsi/csi-resizer + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect + registry: k8s.gcr.io/ + repository: sig-storage/csi-resizer pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v1.1.0 @@ -68,9 +68,9 @@ zfsController: name: "csi-snapshotter" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect - registry: quay.io/ - repository: k8scsi/csi-snapshotter + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect + registry: k8s.gcr.io/ + repository: sig-storage/csi-snapshotter pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v4.0.0 @@ -78,9 +78,9 @@ zfsController: name: "snapshot-controller" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect - registry: quay.io/ - repository: k8scsi/snapshot-controller + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect + registry: k8s.gcr.io/ + repository: sig-storage/snapshot-controller pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v4.0.0 @@ -88,9 +88,9 @@ zfsController: name: "csi-provisioner" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect - registry: quay.io/ - repository: k8scsi/csi-provisioner + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect + registry: k8s.gcr.io/ + repository: sig-storage/csi-provisioner pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: v2.1.0 @@ -118,12 +118,12 @@ zfsPlugin: name: "openebs-zfs-plugin" image: # Make sure that registry name end with a '/'. - # For example : quay.io/ is a correct value here and quay.io is incorrect + # For example : k8s.gcr.io/ is a correct value here and quay.io is incorrect registry: repository: openebs/zfs-driver pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: 1.3.0 + tag: 1.4.0 role: openebs-zfs