Merge pull request #89539 from seans3/kubectl-apply-fix

Fixes problem where kubectl apply stops after first error

Kubernetes-commit: 2d4253077d2a8b630268822f4d986d6b4e5eaecd
This commit is contained in:
Kubernetes Publisher 2020-03-27 17:11:53 -07:00
parent 26ca5b3402
commit c073e8315c
3 changed files with 8 additions and 8 deletions

4
Godeps/Godeps.json generated
View File

@ -572,7 +572,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "e92250ad09d8"
"Rev": "f8e71527369e"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -588,7 +588,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "e497f1de9ccf"
"Rev": "4b266285e7b8"
},
{
"ImportPath": "k8s.io/gengo",

8
go.mod
View File

@ -35,10 +35,10 @@ require (
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200326015715-b5bd82427fa8
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
k8s.io/apimachinery v0.0.0-20200326055028-f8e71527369e
k8s.io/cli-runtime v0.0.0-20200326030619-77d7d76edfc9
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
k8s.io/component-base v0.0.0-20200327180121-4b266285e7b8
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0-20200326030134-feda5dbe8e43
@ -52,10 +52,10 @@ 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-20200326015715-b5bd82427fa8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200326055028-f8e71527369e
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200326030619-77d7d76edfc9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200326014500-24eba7841593
k8s.io/component-base => k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf
k8s.io/component-base => k8s.io/component-base v0.0.0-20200327180121-4b266285e7b8
k8s.io/metrics => k8s.io/metrics v0.0.0-20200326030134-feda5dbe8e43
)

4
go.sum
View File

@ -327,11 +327,11 @@ 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-20200326015715-b5bd82427fa8/go.mod h1:ccyYpAL1p/8sTW0H16JKHFFZ+99445VJK+SEiiyYEcg=
k8s.io/apimachinery v0.0.0-20200326015016-e92250ad09d8/go.mod h1:MwmRUlFgPZZjQ9mmX205Ve0gth+HzXB7tiAFmJilVME=
k8s.io/apimachinery v0.0.0-20200326055028-f8e71527369e/go.mod h1:MwmRUlFgPZZjQ9mmX205Ve0gth+HzXB7tiAFmJilVME=
k8s.io/cli-runtime v0.0.0-20200326030619-77d7d76edfc9/go.mod h1:u7BuFKwcVhFiX7IlG/vKVc6ekMNFtvnE3UpIRln3+jQ=
k8s.io/client-go v0.0.0-20200326020446-6240434e1ad6/go.mod h1:qcKFlt/v+9msJK8wX7HIxQfbxR7Avq+hAcomDVcfhUI=
k8s.io/code-generator v0.0.0-20200326014500-24eba7841593/go.mod h1:1lyWWdDpcrAfLSqwJSCf20KSqoobp5XhTfsWZa7mJBM=
k8s.io/component-base v0.0.0-20200326021816-e497f1de9ccf/go.mod h1:CrYC6PfucljQ1Zt/e5g/ZiqbolCUEjVEkL9xfxSFWk0=
k8s.io/component-base v0.0.0-20200327180121-4b266285e7b8/go.mod h1:MalEhwKQWh+CU4/1Mx270OdHKZqx8441pXzuYpDsVBw=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=