Merge pull request #5143 from rajatjindal/fix-drain

set default GracePeriodSeconds to -1 when draining nodes
kubernetes · May 17, 2018 · 80c692f · 80c692f
2 parents be15242 + 3961d85
commit 80c692f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go
@@ -303,12 +303,13 @@ func (r *RollingUpdateInstanceGroup) DrainNode(u *cloudinstances.CloudInstanceGr
 	errOut := os.Stderr
 
 	options := &cmd.DrainOptions{
-		Factory:          f,
-		Out:              out,
-		IgnoreDaemonsets: true,
-		Force:            true,
-		DeleteLocalData:  true,
-		ErrOut:           errOut,
+		Factory:            f,
+		Out:                out,
+		IgnoreDaemonsets:   true,
+		Force:              true,
+		DeleteLocalData:    true,
+		ErrOut:             errOut,
+		GracePeriodSeconds: -1,
 	}
 
 	cmd := cmd.NewCmdDrain(f, out, errOut)