Merge pull request #77354 from jennybuckley/crd-apply

Use CRD validation field in server-side apply

Kubernetes-commit: ab162cd28c332d0ecfb4f918d5f91e9e57acdb61
This commit is contained in:
Kubernetes Publisher 2019-08-30 23:53:47 -07:00
parent 180a7ec9cb
commit 37642bccd2
3 changed files with 15 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -372,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "40d3837b7e3d"
"Rev": "7364b6bdad65"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "4147c925140e"
"Rev": "461753078381"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "8248d0a0e61a"
"Rev": "3fe2abece89e"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "ac1d987bcbab"
"Rev": "37a093468564"
},
{
"ImportPath": "k8s.io/gengo",
@ -396,7 +396,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "33be087ad058"
"Rev": "743ec37842bf"
},
{
"ImportPath": "k8s.io/utils",

13
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190831074630-461753078381
k8s.io/component-base v0.0.0-20190831075413-37a093468564
)
replace (
@ -17,9 +17,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
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 => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20190831074750-7364b6bdad65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831074630-461753078381
k8s.io/client-go => k8s.io/client-go v0.0.0-20190831074946-3fe2abece89e
k8s.io/component-base => k8s.io/component-base v0.0.0-20190831075413-37a093468564
)

4
go.sum
View File

@ -149,6 +149,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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-20190831074750-7364b6bdad65/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q=
k8s.io/apimachinery v0.0.0-20190831074630-461753078381/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4=
k8s.io/client-go v0.0.0-20190831074946-3fe2abece89e/go.mod h1:hAiMqq+tCk9hxFvWr2DoRiVyCYEGpni4eOcGCQLOEfM=
k8s.io/component-base v0.0.0-20190831075413-37a093468564/go.mod h1:pB3zmhcOR5xextKMKdxRr2XUCERS2UNFA/6Tr2WmSJs=
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=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=