diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index cb88695b4..18e43d3f7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -520,11 +520,11 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "e71eb83a557c" + "Rev": "f9f2f3f8ab02" }, { "ImportPath": "k8s.io/client-go", - "Rev": "b1fd78950135" + "Rev": "911ef75fbcbf" }, { "ImportPath": "k8s.io/component-base", diff --git a/go.mod b/go.mod index 3ad9ac326..e7befa624 100644 --- a/go.mod +++ b/go.mod @@ -49,8 +49,8 @@ require ( gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect k8s.io/api v0.0.0-20191005115622-2e41325d9e4b - k8s.io/apimachinery v0.0.0-20191005115455-e71eb83a557c - k8s.io/client-go v0.0.0-20191005115821-b1fd78950135 + k8s.io/apimachinery v0.0.0-20191006235458-f9f2f3f8ab02 + k8s.io/client-go v0.0.0-20191007155814-911ef75fbcbf k8s.io/component-base v0.0.0-20191005120246-f5216b94ab44 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf @@ -68,7 +68,7 @@ replace ( golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d k8s.io/api => k8s.io/api v0.0.0-20191005115622-2e41325d9e4b - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191005115455-e71eb83a557c - k8s.io/client-go => k8s.io/client-go v0.0.0-20191005115821-b1fd78950135 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191006235458-f9f2f3f8ab02 + k8s.io/client-go => k8s.io/client-go v0.0.0-20191007155814-911ef75fbcbf k8s.io/component-base => k8s.io/component-base v0.0.0-20191005120246-f5216b94ab44 ) diff --git a/go.sum b/go.sum index 883238e1c..b6179d4f7 100644 --- a/go.sum +++ b/go.sum @@ -293,8 +293,8 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.0.0-20191005115622-2e41325d9e4b/go.mod h1:V9fqJJO3eGaWUKb9e6wH3fx7JXl1IaSC1VhSLk7GJjA= -k8s.io/apimachinery v0.0.0-20191005115455-e71eb83a557c/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= -k8s.io/client-go v0.0.0-20191005115821-b1fd78950135/go.mod h1:y9Rvsae8RfW0HpclmE1lCx4wUxrLDRhXv9gh8SWYhvc= +k8s.io/apimachinery v0.0.0-20191006235458-f9f2f3f8ab02/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= +k8s.io/client-go v0.0.0-20191007155814-911ef75fbcbf/go.mod h1:Ej3Cs9QxIg8+T2Y4v/Bh8DVv/JNYZrix9UwRQDG49ck= k8s.io/component-base v0.0.0-20191005120246-f5216b94ab44/go.mod h1:vczWDSFYXxd5GBHBZnq89a2XZiLBK59t2JpoadwKV8o= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/pkg/server/options/server_run_options.go b/pkg/server/options/server_run_options.go index e495aa8b5..cfc35ef2a 100644 --- a/pkg/server/options/server_run_options.go +++ b/pkg/server/options/server_run_options.go @@ -215,7 +215,7 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) { fs.DurationVar(&s.ShutdownDelayDuration, "shutdown-delay-duration", s.ShutdownDelayDuration, ""+ "Time to delay the termination. During that time the server keeps serving requests normally and /healthz "+ - "returns success, but /readzy immediately returns failure. Graceful termination starts after this delay "+ + "returns success, but /readyz immediately returns failure. Graceful termination starts after this delay "+ "has elapsed. This can be used to allow load balancer to stop sending traffic to this server.") utilfeature.DefaultMutableFeatureGate.AddFlag(fs)