From 18560c964caf4b4a7f007f812c76f8a885665e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= <zhangzujian.7@gmail.com>
Date: Fri, 7 Jul 2023 17:10:36 +0800
Subject: [PATCH] cleanup.sh: wait for provier-networks to be deleted before
 deleting kube-ovn-cni (#3006)

---
 .github/workflows/build-x86-image.yaml | 21 +++++++++------------
 dist/images/cleanup.sh                 |  5 ++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
index a0c52226a50..af97507b7f4 100644
--- a/.github/workflows/build-x86-image.yaml
+++ b/.github/workflows/build-x86-image.yaml
@@ -968,10 +968,7 @@ jobs:
           done
 
       - name: Cleanup
-        run: |
-          if [ "${{ matrix.mode }}" != underlay ]; then
-            sh -x dist/images/cleanup.sh
-          fi
+        run: sh -x dist/images/cleanup.sh
 
   kube-ovn-ic-conformance-e2e:
     name: Kube-OVN IC Conformance E2E
@@ -1108,7 +1105,7 @@ jobs:
         run: make kind-install-chart
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   underlay-logical-gateway-installation-test:
     name: Underlay Logical Gateway Installation Test
@@ -1144,7 +1141,7 @@ jobs:
         run: make kind-install-underlay-logical-gateway-dual
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   no-ovn-lb-test:
     name: Disable OVN LB Test
@@ -1182,7 +1179,7 @@ jobs:
         run: make kind-install
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   no-np-test:
     name: Disable Network Policy Test
@@ -1220,7 +1217,7 @@ jobs:
         run: make kind-install
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   lb-svc-e2e:
     name: LB Service E2E
@@ -1535,7 +1532,7 @@ jobs:
           path: installation-compatibility-test-ko-log.tar.gz
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   cilium-chaining-e2e:
     name: Cilium Chaining E2E
@@ -1642,7 +1639,7 @@ jobs:
           path: cilium-chaining-e2e-ko-log.tar.gz
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   kube-ovn-security-e2e:
     name: Kube-OVN Security E2E
@@ -1757,7 +1754,7 @@ jobs:
           path: kube-ovn-security-e2e-${{ matrix.ssl }}-${{ matrix.bind-local }}-${{ matrix.ip-family }}-ko-log.tar.gz
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   push:
     name: Push Images
@@ -1930,7 +1927,7 @@ jobs:
           path: kube-ovn-submariner-conformance-e2e-ko-log.tar.gz
 
       - name: Cleanup
-        run: sh dist/images/cleanup.sh
+        run: sh -x dist/images/cleanup.sh
 
   iptables-vpc-nat-gw-conformance-e2e:
     name: Iptables VPC NAT Gateway E2E
diff --git a/dist/images/cleanup.sh b/dist/images/cleanup.sh
index 40328ed4adf..d5b02586d91 100644
--- a/dist/images/cleanup.sh
+++ b/dist/images/cleanup.sh
@@ -81,9 +81,12 @@ done
 kubectl delete --ignore-not-found deploy kube-ovn-monitor -n kube-system
 kubectl delete --ignore-not-found cm ovn-config ovn-ic-config ovn-external-gw-config -n kube-system
 kubectl delete --ignore-not-found svc kube-ovn-pinger kube-ovn-controller kube-ovn-cni kube-ovn-monitor -n kube-system
-kubectl delete --ignore-not-found ds kube-ovn-cni -n kube-system
 kubectl delete --ignore-not-found deploy kube-ovn-controller -n kube-system
 
+# wait for provier-networks to be deleted before deleting kube-ovn-cni
+sleep 5
+kubectl delete --ignore-not-found ds kube-ovn-cni -n kube-system
+
 # ensure kube-ovn-cni has been deleted
 while :; do
   if [ $(kubectl get pod --no-headers -n kube-system -l app=kube-ovn-cni | wc -l) -eq 0 ]; then