mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #108314 from wking/avoid-drain-controller-assumptions
kubectl drain: Generic "declare a controller" message
This commit is contained in:
commit
c71f9465b1
@ -190,7 +190,7 @@ func NewCmdDrain(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr
|
|||||||
cmdutil.CheckErr(o.RunDrain())
|
cmdutil.CheckErr(o.RunDrain())
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
cmd.Flags().BoolVar(&o.drainer.Force, "force", o.drainer.Force, "Continue even if there are pods not managed by a ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet.")
|
cmd.Flags().BoolVar(&o.drainer.Force, "force", o.drainer.Force, "Continue even if there are pods that do not declare a controller.")
|
||||||
cmd.Flags().BoolVar(&o.drainer.IgnoreAllDaemonSets, "ignore-daemonsets", o.drainer.IgnoreAllDaemonSets, "Ignore DaemonSet-managed pods.")
|
cmd.Flags().BoolVar(&o.drainer.IgnoreAllDaemonSets, "ignore-daemonsets", o.drainer.IgnoreAllDaemonSets, "Ignore DaemonSet-managed pods.")
|
||||||
cmd.Flags().BoolVar(&o.drainer.DeleteEmptyDirData, "delete-local-data", o.drainer.DeleteEmptyDirData, "Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained).")
|
cmd.Flags().BoolVar(&o.drainer.DeleteEmptyDirData, "delete-local-data", o.drainer.DeleteEmptyDirData, "Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained).")
|
||||||
cmd.Flags().MarkDeprecated("delete-local-data", "This option is deprecated and will be deleted. Use --delete-emptydir-data.")
|
cmd.Flags().MarkDeprecated("delete-local-data", "This option is deprecated and will be deleted. Use --delete-emptydir-data.")
|
||||||
|
@ -599,7 +599,7 @@ func TestDrain(t *testing.T) {
|
|||||||
args: []string{"node", "--force"},
|
args: []string{"node", "--force"},
|
||||||
expectFatal: false,
|
expectFatal: false,
|
||||||
expectDelete: true,
|
expectDelete: true,
|
||||||
expectWarning: "WARNING: deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet: default/bar",
|
expectWarning: "WARNING: deleting Pods that declare no controller: default/bar",
|
||||||
expectOutputToContain: "node/node drained",
|
expectOutputToContain: "node/node drained",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -33,8 +33,8 @@ const (
|
|||||||
daemonSetWarning = "ignoring DaemonSet-managed Pods"
|
daemonSetWarning = "ignoring DaemonSet-managed Pods"
|
||||||
localStorageFatal = "Pods with local storage (use --delete-emptydir-data to override)"
|
localStorageFatal = "Pods with local storage (use --delete-emptydir-data to override)"
|
||||||
localStorageWarning = "deleting Pods with local storage"
|
localStorageWarning = "deleting Pods with local storage"
|
||||||
unmanagedFatal = "Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet (use --force to override)"
|
unmanagedFatal = "Pods declare no controller (use --force to override)"
|
||||||
unmanagedWarning = "deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet"
|
unmanagedWarning = "deleting Pods that declare no controller"
|
||||||
)
|
)
|
||||||
|
|
||||||
// PodDelete informs filtering logic whether a pod should be deleted or not
|
// PodDelete informs filtering logic whether a pod should be deleted or not
|
||||||
|
Loading…
Reference in New Issue
Block a user