complete rollback function when upgrade failed

Signed-off-by: hxcGit <houxc_mail@163.com>
openyurtio · Apr 13, 2023 · 6346766 · 6346766
1 parent 87e0e47
commit 6346766
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/node-servant/static-pod-upgrade/upgrade.go b/pkg/node-servant/static-pod-upgrade/upgrade.go
@@ -119,6 +119,9 @@ func (ctrl *Controller) AutoUpgrade() error {
 	// (3) Verify the new static pod is running
 	ok, err := ctrl.verify()
 	if err != nil {
+		if err := ctrl.rollbackManifest(); err != nil {
+			klog.Errorf("Fail to rollback manifest when upgrade failed, %v", err)
+		}
 		return err
 	}
 	if !ok {

diff --git a/pkg/node-servant/static-pod-upgrade/util/util.go b/pkg/node-servant/static-pod-upgrade/util/util.go
@@ -96,7 +96,7 @@ func WaitForPodRunning(namespace, name, hash string, timeout time.Duration) (boo
 		select {
 		case <-ctx.Done():
 			return false, fmt.Errorf("timeout waiting for static pod %s/%s to be running", namespace, name)
-		default:
+		case <-ticker.C:
 			pod, err := GetPodFromYurtHub(namespace, name)
 			if err != nil {
 				klog.V(4).Infof("Temporarily fail to get pod from YurtHub, %v", err)
@@ -108,6 +108,5 @@ func WaitForPodRunning(namespace, name, hash string, timeout time.Duration) (boo
 				}
 			}
 		}
-		<-ticker.C
 	}
 }