Skip to content

Commit 3957427

Browse files
committed
wait for all pods to be deleted before deleting serviceaccount/clusterrole/clusterrolebinding (#4035)
Signed-off-by: zhangzujian <[email protected]>
1 parent b772798 commit 3957427

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

dist/images/cleanup.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ kubectl delete --ignore-not-found deploy ovn-central -n kube-system
113113
kubectl delete --ignore-not-found ds ovs-ovn -n kube-system
114114
kubectl delete --ignore-not-found ds ovs-ovn-dpdk -n kube-system
115115
kubectl delete --ignore-not-found secret kube-ovn-tls -n kube-system
116-
kubectl delete --ignore-not-found sa ovn ovn-ovs kube-ovn-cni kube-ovn-app -n kube-system
117-
kubectl delete --ignore-not-found clusterrole system:ovn system:ovn-ovs system:kube-ovn-cni system:kube-ovn-app
118-
kubectl delete --ignore-not-found clusterrolebinding ovn ovn ovn-ovs kube-ovn-cni kube-ovn-app
119116

120117
# delete vpc-dns content
121118
kubectl delete --ignore-not-found cm vpc-dns-config -n kube-system
@@ -190,6 +187,11 @@ while :; do
190187
kubectl -n kube-system get pod -l component=network -o wide
191188
done
192189

190+
# wait for all pods to be deleted before deleting serviceaccount/clusterrole/clusterrolebinding
191+
kubectl delete --ignore-not-found sa ovn ovn-ovs kube-ovn-cni kube-ovn-app -n kube-system
192+
kubectl delete --ignore-not-found clusterrole system:ovn system:ovn-ovs system:kube-ovn-cni system:kube-ovn-app
193+
kubectl delete --ignore-not-found clusterrolebinding ovn ovn ovn-ovs kube-ovn-cni kube-ovn-app
194+
193195
# Remove annotations in all pods of all namespaces
194196
for ns in $(kubectl get ns -o name | awk -F/ '{print $2}'); do
195197
echo "annotating pods in namespace $ns"

0 commit comments

Comments
 (0)