improving upgrade script

Signed-off-by: Pawan <pawan@mayadata.io>

upgrade/README.md

@@ -1,4 +1,4 @@
-From zfs-driver:v0.6 version ZFS-LocalPV related CRs are now grouped together in its own group called `zfs.openebs.io`. Here steps are mentioned for how to upgrade for refactoring the CRDs.
+From zfs-driver:v0.6 version ZFS-LocalPV related CRs are now grouped together in its own group called `zfs.openebs.io`. Here steps are mentioned for how to upgrade for refactoring the CRDs. Please do not provision/deprovision any volume during the upgrade.
 
 steps to upgrade:-
 
@@ -21,7 +21,9 @@ zfsvolume.zfs.openebs.io/pvc-82368c44-eee8-47ee-85a6-633a8023faa8 created
 zfssnapshot.zfs.openebs.io/snapshot-dc61a056-f495-482b-8e6e-e7ddc4c13f47 created
 zfssnapshot.zfs.openebs.io/snapshot-f9db91ea-529e-4dac-b2b8-ead045c612da created
 ```
-`
+Please note that if you have modified the OPENEBS_NAMESPACE env in the driver's deployment to other namespace. Then you have to pass the namespace as an argument to the upgrade.sh script `sh upgrade/upgrash.sh [namespace]`.
+
+
 3. upgrade the driver to v0.6
 
 ```
@@ -55,4 +57,6 @@ zfssnapshot.openebs.io/snapshot-f9db91ea-529e-4dac-b2b8-ead045c612da configured
 zfssnapshot.openebs.io "snapshot-dc61a056-f495-482b-8e6e-e7ddc4c13f47" deleted
 zfssnapshot.openebs.io "snapshot-f9db91ea-529e-4dac-b2b8-ead045c612da" deleted
 customresourcedefinition.apiextensions.k8s.io "zfssnapshots.openebs.io" deleted
-```
+```
+
+Please note that if you have modified the OPENEBS_NAMESPACE env in the driver's deployment to other namespace. Then you have to pass the namespace as an argument to the cleanup.sh script `sh upgrade/cleanup.sh [namespace]`.

upgrade/cleanup.sh

@@ -2,29 +2,44 @@
 
 set -e
 
-kubectl get zfsvolumes.openebs.io -n openebs -oyaml > volumes.yaml
+numVol=`kubectl get zfsvolumes.openebs.io -n openebs | wc -l`
 
-# remove the finalizer from the old CR
-sed -i "/zfs.openebs.io\/finalizer/d" volumes.yaml
-kubectl apply -f volumes.yaml
+if [ $numVol -gt 1 ]; then
+	echo "Cleaning the ZFS Volumes(`expr $numVol - 1`)"
+	kubectl get zfsvolumes.openebs.io -n openebs -oyaml > volumes.yaml
 
-# delete the old CR
-kubectl delete -f volumes.yaml
+	# remove the finalizer from the old CR
+	sed -i "/zfs.openebs.io\/finalizer/d" volumes.yaml
+	kubectl apply -f volumes.yaml
 
-# delete the CRD definition
+	# delete the old CR
+	kubectl delete -f volumes.yaml
+fi
+
+# delete the ZFSVolume CRD definition
 kubectl delete crd zfsvolumes.openebs.io
 
-# delete the volumeattachment object
-kubectl delete volumeattachment --all
+numAttach=`kubectl get volumeattachment | grep zfs.csi.openebs.io | wc -l`
+
+if [ $numAttach -gt 0 ]; then
+	echo "Cleaning the volumeattachment(`expr $numAttach - 1`)"
+	# delete the volumeattachment object
+	kubectl delete volumeattachment --all
+fi
+
+numSnap=`kubectl get zfssnapshots.openebs.io -n openebs | wc -l`
 
-kubectl get zfssnapshots.openebs.io -n openebs -oyaml > snapshots.yaml
+if [ $numSnap -gt 1 ]; then
+	echo "Cleaning the ZFS Snapshot(`expr $numSnap - 1`)"
+	kubectl get zfssnapshots.openebs.io -n openebs -oyaml > snapshots.yaml
 
-# remove the finalizer from the old CR
-sed -i "/zfs.openebs.io\/finalizer/d" snapshots.yaml
-kubectl apply -f snapshots.yaml
+	# remove the finalizer from the old CR
+	sed -i "/zfs.openebs.io\/finalizer/d" snapshots.yaml
+	kubectl apply -f snapshots.yaml
 
-# delete the old CR
-kubectl delete -f snapshots.yaml
+	# delete the old CR
+	kubectl delete -f snapshots.yaml
+fi
 
-# delete the CRD definition
+# delete the ZFSSnapshot CRD definition
 kubectl delete crd zfssnapshots.openebs.io

upgrade/upgrade.sh

@@ -1,28 +1,43 @@
 #!/bin/bash
 
+# do not provision/deprovision anything while running the upgrade script.
+
 set -e
 
-# ZFSVolumes: create the new CR with apiVersion as zfs.openebs.io and kind as Volume
+if [ -z $1 ]; then
+	# default namespace is openebs when all the custom resources are created
+	ZFSPV_NAMESPACE="openebs"
+else
+	ZFSPV_NAMESPACE=$1
+fi
+
+numVol=`kubectl get zfsvolumes.openebs.io -n openebs | wc -l`
 
-kubectl get zfsvolumes.openebs.io -n openebs -oyaml > volumes.yaml
+if [ $numVol -gt 1 ]; then
+	# ZFSVolumes: create the new CR with apiVersion as zfs.openebs.io and kind as Volume
 
+	kubectl get zfsvolumes.openebs.io -n $ZFSPV_NAMESPACE -oyaml > volumes.yaml
 
-# update the group name to zfs.openebs.io
-sed -i "s/apiVersion: openebs.io/apiVersion: zfs.openebs.io/g" volumes.yaml
-# create the new CR
-kubectl apply -f volumes.yaml
+	# update the group name to zfs.openebs.io
+	sed -i "s/apiVersion: openebs.io/apiVersion: zfs.openebs.io/g" volumes.yaml
+	# create the new CR
+	kubectl apply -f volumes.yaml
 
-rm volumes.yaml
+	rm volumes.yaml
+fi
 
+numSnap=`kubectl get zfssnapshots.openebs.io -n openebs | wc -l`
 
-# ZFSSnapshots: create the new CR with apiVersion as zfs.openebs.io and kind as Snapshot
+if [ $numSnap -gt 1 ]; then
+	# ZFSSnapshots: create the new CR with apiVersion as zfs.openebs.io and kind as Snapshot
 
-kubectl get zfssnapshots.openebs.io -n openebs -oyaml > snapshots.yaml
+	kubectl get zfssnapshots.openebs.io -n openebs -oyaml > snapshots.yaml
 
 
-# update the group name to zfs.openebs.io
-sed -i "s/apiVersion: openebs.io/apiVersion: zfs.openebs.io/g" snapshots.yaml
-# create the new CR
-kubectl apply -f snapshots.yaml
+	# update the group name to zfs.openebs.io
+	sed -i "s/apiVersion: openebs.io/apiVersion: zfs.openebs.io/g" snapshots.yaml
+	# create the new CR
+	kubectl apply -f snapshots.yaml
 
-rm snapshots.yaml
+	rm snapshots.yaml
+fi