Merge pull request #9090 from michalschott/8994-into-1.17

manual cherry-pick #8994 into 1.17.
kubernetes · May 7, 2020 · 9eacbe3 · 9eacbe3
2 parents b002fc0 + 3a0fa15
commit 9eacbe3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go
@@ -346,10 +346,16 @@ func (r *RollingUpdateInstanceGroup) DrainNode(u *cloudinstances.CloudInstanceGr
 	}
 
 	if err := drain.RunCordonOrUncordon(helper, u.Node, true); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
 		return fmt.Errorf("error cordoning node: %v", err)
 	}
 
 	if err := drain.RunNodeDrain(helper, u.Node.Name); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
 		return fmt.Errorf("error draining node: %v", err)
 	}