diff --git a/dist/images/upgrade-ovs.sh b/dist/images/upgrade-ovs.sh index a3e629038e8..0479e8bd4cd 100755 --- a/dist/images/upgrade-ovs.sh +++ b/dist/images/upgrade-ovs.sh @@ -1,8 +1,15 @@ #!/bin/bash +dsChartVer=`kubectl get ds -n kube-system ovs-ovn -o jsonpath={.metadata.annotations.chart-version}` podNames=`kubectl get pod -n kube-system | grep ovs-ovn | awk '{print $1}'` for pod in $podNames do + podChartVer=`kubectl get pod -n kube-system $pod -o jsonpath={.metadata.annotations.chart-version}` + if [ $dsChartVer == $podChartVer ] + then + echo "pod $pod alreay upgraded" + continue + fi echo "upgrade pod $pod" kubectl delete pod -n kube-system $pod @@ -18,6 +25,6 @@ do readyNum=$(kubectl get daemonset -n kube-system | grep ovs-ovn | awk {'print $4'}) availableNum=$(kubectl get daemonset -n kube-system | grep ovs-ovn | awk {'print $6'}) echo "ovs-ovn upgrade, desire $desireNum, current $currentNum, ready $readyNum, available $availableNum" - sleep 1 + sleep 0.5 done done