From 538b8548536405469d9e158d3dba36b3a71ad356 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 16 Apr 2020 12:42:00 +0530 Subject: [PATCH] script: Delete snapshot CRD created by cephcsi in rook when we deploy rook+cephcsi for E2E, the external-snapshotter in cephcsi deployed by rook will create the CRD, we need to delete the crd created by external-snapshotter. Signed-off-by: Madhu Rajanna --- scripts/travis-functest.sh | 2 ++ scripts/travis-helmtest.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/travis-functest.sh b/scripts/travis-functest.sh index bb5975c21..6ef7fcd3d 100755 --- a/scripts/travis-functest.sh +++ b/scripts/travis-functest.sh @@ -10,6 +10,8 @@ sudo scripts/minikube.sh create-block-pool # pull docker images to speed up e2e sudo scripts/minikube.sh cephcsi sudo scripts/minikube.sh k8s-sidecar +# delete snapshot CRD created by ceph-csi in rook +scripts/install-snapshot.sh delete-crd # install snapshot controller scripts/install-snapshot.sh install sudo chown -R travis: "$HOME"/.minikube /usr/local/bin/kubectl diff --git a/scripts/travis-helmtest.sh b/scripts/travis-helmtest.sh index 7b60eff63..fb04453d9 100755 --- a/scripts/travis-helmtest.sh +++ b/scripts/travis-helmtest.sh @@ -15,6 +15,8 @@ sudo chown -R travis: "$HOME"/.minikube /usr/local/bin/kubectl NAMESPACE=cephcsi-e2e-$RANDOM # create ns for e2e kubectl create ns ${NAMESPACE} +# delete snapshot CRD created by ceph-csi in rook +scripts/install-snapshot.sh delete-crd # install snapshot controller scripts/install-snapshot.sh install # set up helm