Reorder cleanup step by put subnet and vpc to the last to avoid confl…

…ict (#2776)

dist/images/cleanup.sh

@@ -10,33 +10,10 @@ while :; do
   sleep 1
 done
 
-set +e
-for subnet in $(kubectl get subnet -o name); do
-  kubectl patch "$subnet" --type='json' -p '[{"op": "replace", "path": "/metadata/finalizers", "value": []}]'
-  kubectl delete --ignore-not-found "$subnet"
-done
-set -e
-
-for vpc in $(kubectl get vpc -o name); do
-  kubectl delete --ignore-not-found $vpc
-done
-
 for gw in $(kubectl get vpc-nat-gw -o name); do
   kubectl delete --ignore-not-found $gw
 done
 
-for vlan in $(kubectl get vlan -o name); do
-  kubectl delete --ignore-not-found $vlan
-done
-
-for pn in $(kubectl get provider-network -o name); do
-  kubectl delete --ignore-not-found $pn
-done
-
-for slr in $(kubectl get switch-lb-rule -o name); do
-   kubectl delete --ignore-not-found $slr
-done
-
 for vd in $(kubectl  get vpc-dns -o name); do
   kubectl delete --ignore-not-found $vd
 done
@@ -45,10 +22,6 @@ for vip in $(kubectl get vip -o name); do
    kubectl delete --ignore-not-found $vip
 done
 
-for eip in $(kubectl get eip -o name); do
-   kubectl delete --ignore-not-found $eip
-done
-
 for snat in $(kubectl get snat -o name); do
    kubectl delete --ignore-not-found $snat
 done
@@ -61,6 +34,9 @@ for fip in $(kubectl get fip -o name); do
    kubectl delete --ignore-not-found $fip
 done
 
+for eip in $(kubectl get eip -o name); do
+   kubectl delete --ignore-not-found $eip
+done
 
 for osnat in $(kubectl get osnat -o name); do
    kubectl delete --ignore-not-found $osnat
@@ -74,6 +50,29 @@ for oeip in $(kubectl get oeip -o name); do
    kubectl delete --ignore-not-found $oeip
 done
 
+for vlan in $(kubectl get vlan -o name); do
+  kubectl delete --ignore-not-found $vlan
+done
+
+for pn in $(kubectl get provider-network -o name); do
+  kubectl delete --ignore-not-found $pn
+done
+
+for slr in $(kubectl get switch-lb-rule -o name); do
+   kubectl delete --ignore-not-found $slr
+done
+
+set +e
+for subnet in $(kubectl get subnet -o name); do
+  kubectl patch "$subnet" --type='json' -p '[{"op": "replace", "path": "/metadata/finalizers", "value": []}]'
+  kubectl delete --ignore-not-found "$subnet"
+done
+set -e
+
+for vpc in $(kubectl get vpc -o name); do
+  kubectl delete --ignore-not-found $vpc
+done
+
 # Delete Kube-OVN components
 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