ovs: get controllerrevision with option --ignore-not-found

Signed-off-by: zhangzujian <[email protected]>

dist/images/cleanup.sh

@@ -183,7 +183,10 @@ while :; do
   if [ $(kubectl get pod -n kube-system -l component=network -o name | wc -l) -eq 0 ]; then
     break
   fi
-  kubectl -n kube-system get pod -l component=network -o wide
+  for pod in `kubectl -n kube-system get pod -l component=network -o name`; do
+    echo "$pod logs:"
+    kubectl -n kube-system logs $pod --timestamps --tail 50
+  done
 done
 
 # wait for all pods to be deleted before deleting serviceaccount/clusterrole/clusterrolebinding

dist/images/start-ovs.sh

@@ -52,10 +52,10 @@ function cgroup_match {
 function quit {
   gen_name=$(kubectl -n "${POD_NAMESPACE}" get pod "${POD_NAME}" -o jsonpath='{.metadata.generateName}')
   revision_hash=$(kubectl -n "${POD_NAMESPACE}" get pod "${POD_NAME}" -o jsonpath='{.metadata.labels.controller-revision-hash}')
-  revision=$(kubectl -n "${POD_NAMESPACE}" get controllerrevision "${gen_name}${revision_hash}" -o jsonpath='{.revision}')
+  revision=$(kubectl -n "${POD_NAMESPACE}" get controllerrevision "${gen_name}${revision_hash}" --ignore-not-found -o jsonpath='{.revision}')
   ds_name=${gen_name%-}
   latest_revision=$(kubectl -n "${POD_NAMESPACE}" get controllerrevision --no-headers | awk '$2 == "daemonset.apps/'$ds_name'" {print $3}' | sort -nr | head -n1)
-  if [ "x$latest_revision" = "x$revision" ]; then
+  if [ "x$revision" = "x" -o "x$latest_revision" = "x$revision" ]; then
     # stop ovn-controller/ovs only when the processes are in the same cgroup
     pid=$(/usr/share/ovn/scripts/ovn-ctl status_controller | awk '{print $NF}')
     if cgroup_match "${pid}" self; then