upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-05-28 04:35:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #96812 from bboreham/comment-grace

Browse source 
Comment default behaviour of kubectl drain.GracePeriodSeconds

Kubernetes-commit: c2ac8c360e5170667b86e7ff6860424091e2ebf3
This commit is contained in:
Kubernetes Publisher 2021-01-21 08:25:02 -08:00
commit dcfa726ef4
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Godeps/Godeps.json generated
View file

@ -928,7 +928,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "0e9f9cff521d"
"Rev": "460d10991a52"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -936,7 +936,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "fc034b4b7616"
"Rev": "b72204b2445d"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View file

@ -35,9 +35,9 @@ require (
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20210115125903-c873f2e8ab25
k8s.io/apimachinery v0.0.0-20210116045657-0e9f9cff521d
k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52
k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
k8s.io/client-go v0.0.0-20210116050105-fc034b4b7616
k8s.io/client-go v0.0.0-20210121071529-b72204b2445d
k8s.io/component-base v0.0.0-20210115210250-6b412b2ef0d8
k8s.io/component-helpers v0.0.0-20210114010638-f2e8fa560240
k8s.io/klog/v2 v2.4.0
@ -50,9 +50,9 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20210115125903-c873f2e8ab25
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210116045657-0e9f9cff521d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
k8s.io/client-go => k8s.io/client-go v0.0.0-20210116050105-fc034b4b7616
k8s.io/client-go => k8s.io/client-go v0.0.0-20210121071529-b72204b2445d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210116045519-b01f4fbaae20
k8s.io/component-base => k8s.io/component-base v0.0.0-20210115210250-6b412b2ef0d8
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210114010638-f2e8fa560240

4
go.sum
View file

@ -633,9 +633,9 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210115125903-c873f2e8ab25/go.mod h1:xpUvIW3IJYnKO2yMuT9r4zCZI1ppqiuEejNFI9eoqWo=
k8s.io/apimachinery v0.0.0-20210116045657-0e9f9cff521d/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0/go.mod h1:YGZiEr0qwB6XSdVC2kbXtQG/+bm7+18eWKXckr167Io=
k8s.io/client-go v0.0.0-20210116050105-fc034b4b7616/go.mod h1:qDBXGK92HVL2+FvTDOm7TRYoY6Sy4YlexduPTe93d6U=
k8s.io/client-go v0.0.0-20210121071529-b72204b2445d/go.mod h1:qKpEpdeFNptkCaQgvKQRqiDpcEhyGLqp0w8ALpfvaxA=
k8s.io/code-generator v0.0.0-20210116045519-b01f4fbaae20/go.mod h1:4n8UGwhxQWSnXnDBVEtX8cKaE/oMp1ui3M7yFmjT1fo=
k8s.io/component-base v0.0.0-20210115210250-6b412b2ef0d8/go.mod h1:ioM27aGQfNSdCppNxxKUoGHTWWEMcLSdPF2fyoTvGnU=
k8s.io/component-helpers v0.0.0-20210114010638-f2e8fa560240/go.mod h1:v7ICuF1mkF7h92ZDvx4Y1mRrTQmuD3isyKqt4uOFZLM=

13
pkg/drain/drain.go
View file

@ -46,10 +46,15 @@ const (
// Helper contains the parameters to control the behaviour of drainer
type Helper struct {
Ctx context.Context
Client kubernetes.Interface
Force bool
GracePeriodSeconds int
Ctx context.Context
Client kubernetes.Interface
Force bool
// GracePeriodSeconds is how long to wait for a pod to terminate.
// IMPORTANT: 0 means "delete immediately"; set to a negative value
// to use the pod's terminationGracePeriodSeconds.
GracePeriodSeconds int
IgnoreAllDaemonSets bool
Timeout time.Duration
DeleteEmptyDirData bool