Merge pull request #90448 from soltysh/issue87851

Fix run command when waiting for pods

Kubernetes-commit: b68bf25531b9b9ed0be6ea60fb00a30042fc8a44
This commit is contained in:
Kubernetes Publisher 2020-04-24 15:32:17 -07:00
parent d727dabb7d
commit 6874454206
3 changed files with 23 additions and 23 deletions

12
Godeps/Godeps.json generated
View File

@ -572,23 +572,23 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2ca06ba83edf"
"Rev": "312bc924e104"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "71d337978e2e"
"Rev": "147f4cafe1e5"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "5b13bc8b32e2"
"Rev": "f813b9eb0147"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "d5598eafb022"
"Rev": "0ad81dc3c85d"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "461d14f5d1b5"
"Rev": "1958644bda38"
},
{
"ImportPath": "k8s.io/component-base",
@ -608,7 +608,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "1542edda33c0"
"Rev": "c463d3f35b4a"
},
{
"ImportPath": "k8s.io/utils",

22
go.mod
View File

@ -34,14 +34,14 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200421221621-2ca06ba83edf
k8s.io/apimachinery v0.0.0-20200422181210-71d337978e2e
k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2
k8s.io/client-go v0.0.0-20200422061635-d5598eafb022
k8s.io/api v0.0.0-20200424235922-312bc924e104
k8s.io/apimachinery v0.0.0-20200423195709-147f4cafe1e5
k8s.io/cli-runtime v0.0.0-20200424201741-f813b9eb0147
k8s.io/client-go v0.0.0-20200424080147-0ad81dc3c85d
k8s.io/component-base v0.0.0-20200423061759-681caaeb5a1e
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35
k8s.io/metrics v0.0.0-20200410031643-1542edda33c0
k8s.io/metrics v0.0.0-20200424082059-c463d3f35b4a
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -51,11 +51,11 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200421221621-2ca06ba83edf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200422181210-71d337978e2e
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2
k8s.io/client-go => k8s.io/client-go v0.0.0-20200422061635-d5598eafb022
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200418020935-461d14f5d1b5
k8s.io/api => k8s.io/api v0.0.0-20200424235922-312bc924e104
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200423195709-147f4cafe1e5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200424201741-f813b9eb0147
k8s.io/client-go => k8s.io/client-go v0.0.0-20200424080147-0ad81dc3c85d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200424235518-1958644bda38
k8s.io/component-base => k8s.io/component-base v0.0.0-20200423061759-681caaeb5a1e
k8s.io/metrics => k8s.io/metrics v0.0.0-20200410031643-1542edda33c0
k8s.io/metrics => k8s.io/metrics v0.0.0-20200424082059-c463d3f35b4a
)

12
go.sum
View File

@ -325,11 +325,11 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200421221621-2ca06ba83edf/go.mod h1:ulbB/6H6vVXAkqfLv6nAqwp3OAksqUGzbqvrQ8uWFCs=
k8s.io/apimachinery v0.0.0-20200422181210-71d337978e2e/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo=
k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2/go.mod h1:if8I7E6TpO/p/o/qgW+hlE1SiBfK4wJB59roqSaO1gQ=
k8s.io/client-go v0.0.0-20200422061635-d5598eafb022/go.mod h1:lBtOiyMgQ8Ibafj6tWp9/XLB3w0+XAVoKx6SXTAdPJ4=
k8s.io/code-generator v0.0.0-20200418020935-461d14f5d1b5/go.mod h1:921XK/cUtrTpn/F0nAhNaFjo8I7Kue1BIEtdxsYFt9I=
k8s.io/api v0.0.0-20200424235922-312bc924e104/go.mod h1:OYsmhNxeVRoXBz3xaV+YKAuhCUjOlREBTqtAD/OZoBo=
k8s.io/apimachinery v0.0.0-20200423195709-147f4cafe1e5/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo=
k8s.io/cli-runtime v0.0.0-20200424201741-f813b9eb0147/go.mod h1:aDCidIbffSYqvgTKyPbK0IH61bF7CM8YLBKFqpOOUIM=
k8s.io/client-go v0.0.0-20200424080147-0ad81dc3c85d/go.mod h1:6fX2/t8t2anrYnkj3wBvT0ObCPteMb7rnUL+W2Tn914=
k8s.io/code-generator v0.0.0-20200424235518-1958644bda38/go.mod h1:921XK/cUtrTpn/F0nAhNaFjo8I7Kue1BIEtdxsYFt9I=
k8s.io/component-base v0.0.0-20200423061759-681caaeb5a1e/go.mod h1:HZ3pegcljoPKhQyaHWt9RSDAwJjsWJXD5M5vQhy+iIE=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@ -339,7 +339,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35 h1:FDWYFE3itI1G8UFOMjUuLbROZExo+Rrfm/Qaf473rm4=
k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35/go.mod h1:NwPpO8COeh/j9Q9ModsqBxwHcWDo/PmrJOPyquZCC1A=
k8s.io/metrics v0.0.0-20200410031643-1542edda33c0/go.mod h1:Gd4Q3vzG1vnLdJ2Lr4Brh0xgNXTWZj9ifO85CugGSPs=
k8s.io/metrics v0.0.0-20200424082059-c463d3f35b4a/go.mod h1:wpeARLJsJ1WXEPDJqWko/+C1mub1Kdxag3e5ZICbT1g=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=