From df7e0b18b62599aa610e1c19bde411fd76e9fdee Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 26 Apr 2020 21:41:54 -0700 Subject: [PATCH] Ignore already-deleted nodes during rolling update --- pkg/instancegroups/instancegroups.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go index 20e88e65ed..ed65d8b344 100644 --- a/pkg/instancegroups/instancegroups.go +++ b/pkg/instancegroups/instancegroups.go @@ -322,6 +322,9 @@ func (c *RollingUpdateCluster) patchTaint(ctx context.Context, node *corev1.Node } _, err = c.K8sClient.CoreV1().Nodes().Patch(ctx, node.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}) + if apierrors.IsNotFound(err) { + return nil + } return err } @@ -557,10 +560,16 @@ func (c *RollingUpdateCluster) drainNode(u *cloudinstances.CloudInstanceGroupMem } 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) }