Merge pull request #66266 from wking/kubectl-drain-drop-backOff

kubectl: Drop backOff from DrainOptions
This commit is contained in:
k8s-ci-robot 2018-10-04 19:34:34 -07:00 committed by GitHub
commit fecb5edf8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,7 +23,6 @@ import (
"strings"
"time"
"github.com/jonboulle/clockwork"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
@ -63,7 +62,6 @@ type DrainOptions struct {
GracePeriodSeconds int
IgnoreDaemonsets bool
Timeout time.Duration
backOff clockwork.Clock
DeleteLocalData bool
Selector string
PodSelector string
@ -196,7 +194,6 @@ func NewDrainOptions(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *
PrintFlags: genericclioptions.NewPrintFlags("drained").WithTypeSetter(scheme.Scheme),
IOStreams: ioStreams,
backOff: clockwork.NewRealClock(),
GracePeriodSeconds: -1,
}
}