From 8a6820fa76ba20a51024e7ed755da9562e57eb79 Mon Sep 17 00:00:00 2001 From: Yifan Xiong Date: Thu, 19 Sep 2019 17:21:54 +0800 Subject: [PATCH 1/2] Foreground stop all frameworks Froeground stop all frameworks before delete controller crd. --- src/frameworkcontroller/deploy/delete.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/frameworkcontroller/deploy/delete.sh b/src/frameworkcontroller/deploy/delete.sh index 66b98c84ad..3cc552b0b6 100644 --- a/src/frameworkcontroller/deploy/delete.sh +++ b/src/frameworkcontroller/deploy/delete.sh @@ -19,8 +19,18 @@ pushd $(dirname "$0") > /dev/null +APISERVER=$(kubectl config view | grep server | cut -f 2- -d ":" | tr -d " ") +FRAMEWORK_ENDPOINT="$APISERVER/apis/frameworkcontroller.microsoft.com/v1/namespaces/default/frameworks" +until [[ $(curl -s $FRAMEWORK_ENDPOINT | jq ".items | length") -eq 0 ]]; do + echo 'Trying to stop all frameworks ...' + curl -X DELETE $FRAMEWORK_ENDPOINT \ + -H "Content-Type: application/json" \ + -d '{"kind":"DeleteOptions","apiVersion":"v1","propagationPolicy":"Foreground"}' > /dev/null 2>&1 + sleep 5 +done + /bin/bash stop.sh || exit $? -kubectl delete customresourcedefinitions frameworks.frameworkcontroller.microsoft.com +kubectl delete customresourcedefinitions frameworks.frameworkcontroller.microsoft.com || exit $? popd > /dev/null From 052b1cd44ffefd045a426d407cf62dcc0b17e70b Mon Sep 17 00:00:00 2001 From: Yifan Xiong Date: Thu, 19 Sep 2019 17:28:50 +0800 Subject: [PATCH 2/2] Move crd deletion before stop framework controller Move crd deletion before stop framework controller. --- src/frameworkcontroller/deploy/delete.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/frameworkcontroller/deploy/delete.sh b/src/frameworkcontroller/deploy/delete.sh index 3cc552b0b6..fd014283eb 100644 --- a/src/frameworkcontroller/deploy/delete.sh +++ b/src/frameworkcontroller/deploy/delete.sh @@ -28,9 +28,8 @@ until [[ $(curl -s $FRAMEWORK_ENDPOINT | jq ".items | length") -eq 0 ]]; do -d '{"kind":"DeleteOptions","apiVersion":"v1","propagationPolicy":"Foreground"}' > /dev/null 2>&1 sleep 5 done +kubectl delete customresourcedefinitions frameworks.frameworkcontroller.microsoft.com || exit $? /bin/bash stop.sh || exit $? -kubectl delete customresourcedefinitions frameworks.frameworkcontroller.microsoft.com || exit $? - popd > /dev/null