From ab993e346cb9c58c6b966709d1e84acdf71a3260 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 16 Jul 2018 21:59:29 -0700 Subject: [PATCH] kubectl: Drop backOff from DrainOptions The property was added in b73fae6c (Fix kubectl drain for statefulset and use eviciton for drain if possible, 2016-10-20, #35483), but b358b2df (make drain retry forever and use new timeout, 2016-11-28, #37604) removed the last consumer. --- pkg/kubectl/cmd/drain.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index 578f850c2d..16fcff900c 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -23,7 +23,6 @@ import ( "strings" "time" - "github.com/jonboulle/clockwork" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" @@ -65,7 +64,6 @@ type DrainOptions struct { GracePeriodSeconds int IgnoreDaemonsets bool Timeout time.Duration - backOff clockwork.Clock DeleteLocalData bool Selector string PodSelector string @@ -199,7 +197,6 @@ func NewDrainOptions(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) * PrintFlags: genericclioptions.NewPrintFlags("drained").WithTypeSetter(scheme.Scheme), IOStreams: ioStreams, - backOff: clockwork.NewRealClock(), GracePeriodSeconds: -1, } }