Unverified Commit fecb5edf authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

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

kubectl: Drop backOff from DrainOptions
parents 0928bb4c ab993e34
...@@ -23,7 +23,6 @@ import ( ...@@ -23,7 +23,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/jonboulle/clockwork"
"github.com/spf13/cobra" "github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
...@@ -63,7 +62,6 @@ type DrainOptions struct { ...@@ -63,7 +62,6 @@ type DrainOptions struct {
GracePeriodSeconds int GracePeriodSeconds int
IgnoreDaemonsets bool IgnoreDaemonsets bool
Timeout time.Duration Timeout time.Duration
backOff clockwork.Clock
DeleteLocalData bool DeleteLocalData bool
Selector string Selector string
PodSelector string PodSelector string
...@@ -196,7 +194,6 @@ func NewDrainOptions(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) * ...@@ -196,7 +194,6 @@ func NewDrainOptions(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *
PrintFlags: genericclioptions.NewPrintFlags("drained").WithTypeSetter(scheme.Scheme), PrintFlags: genericclioptions.NewPrintFlags("drained").WithTypeSetter(scheme.Scheme),
IOStreams: ioStreams, IOStreams: ioStreams,
backOff: clockwork.NewRealClock(),
GracePeriodSeconds: -1, GracePeriodSeconds: -1,
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment