Skip to content

Commit

Permalink
Update(deploy): Update the csi-provisioner version to v3.0.0 (#374)
Browse files Browse the repository at this point in the history
Signed-off-by: w3aman <[email protected]>
  • Loading branch information
w3aman authored Sep 1, 2021
1 parent 16f14c3 commit 5030cb4
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ must meet the following prerequisites:

### Supported System

K8S : 1.18+
K8S : 1.20+

OS : Ubuntu, CentOS

Expand Down
17 changes: 14 additions & 3 deletions deploy/yamls/zfs-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ spec:
# do not require volumeattachment
attachRequired: false
podInfoOnMount: false
storageCapacity: true

---

apiVersion: apiextensions.k8s.io/v1
Expand Down Expand Up @@ -762,7 +764,7 @@ spec:
serviceAccount: openebs-zfs-controller-sa
containers:
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0
image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand Down Expand Up @@ -793,7 +795,7 @@ spec:
- "--leader-election=true"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
imagePullPolicy: IfNotPresent
args:
- "--csi-address=$(ADDRESS)"
Expand All @@ -802,10 +804,19 @@ spec:
- "--strict-topology"
- "--leader-election"
- "--extra-create-metadata=true"
- "--enable-capacity=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/
Expand Down Expand Up @@ -995,7 +1006,7 @@ spec:
hostNetwork: true
containers:
- name: csi-node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
imagePullPolicy: IfNotPresent
args:
- "--v=5"
Expand Down
17 changes: 14 additions & 3 deletions deploy/zfs-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,8 @@ spec:
# do not require volumeattachment
attachRequired: false
podInfoOnMount: false
storageCapacity: true

---

apiVersion: apiextensions.k8s.io/v1
Expand Down Expand Up @@ -2055,7 +2057,7 @@ spec:
serviceAccount: openebs-zfs-controller-sa
containers:
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0
image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand Down Expand Up @@ -2086,7 +2088,7 @@ spec:
- "--leader-election=true"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
imagePullPolicy: IfNotPresent
args:
- "--csi-address=$(ADDRESS)"
Expand All @@ -2095,10 +2097,19 @@ spec:
- "--strict-topology"
- "--leader-election"
- "--extra-create-metadata=true"
- "--enable-capacity=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/
Expand Down Expand Up @@ -2288,7 +2299,7 @@ spec:
hostNetwork: true
containers:
- name: csi-node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
imagePullPolicy: IfNotPresent
args:
- "--v=5"
Expand Down
12 changes: 12 additions & 0 deletions upgrade/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,15 @@ Please note that if you have modified the OPENEBS_NAMESPACE env in the driver's
5. *restart kube-controller [optional]*

kube-controller-manager might be using stale volumeattachment resources, it might get flooded with the error logs. Restarting kube-controller will fix it.

### *Note*

While upgrading zfs-driver from v1.9.1 to later version by applying zfs-operator file, we may get this error.
```
The CSIDriver "zfs.csi.openebs.io" is invalid: spec.storageCapacity: Invalid value: true: field is immutable
```
It occurs due to newly added field `storageCapacity: true` in csi driver spec. In that case, first delete the csi-driver by running this command:
```
$ kubectl delete csidriver zfs.csi.openebs.io
```
Now we can again apply the operator yaml file.

0 comments on commit 5030cb4

Please sign in to comment.