Merge pull request #76124 from tossmilestone/fix-crd-validate-items

Fix CRD validation error on 'items' field

Kubernetes-commit: 1a80962db6fc7138f4d2925a82d7e74cd5ec4fcd
This commit is contained in:
Kubernetes Publisher 2019-06-27 12:47:22 -07:00
parent 275abc52b3
commit 09b870d750
3 changed files with 36 additions and 21 deletions

36
Godeps/Godeps.json generated
View File

@ -28,7 +28,7 @@
},
{
"ImportPath": "github.com/PuerkitoBio/purell",
"Rev": "v1.1.0"
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/PuerkitoBio/urlesc",
@ -104,19 +104,19 @@
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "v0.19.0"
"Rev": "v0.19.2"
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "v0.19.0"
"Rev": "v0.19.2"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "v0.17.2"
"Rev": "v0.19.2"
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "v0.17.2"
"Rev": "v0.19.2"
},
{
"ImportPath": "github.com/gogo/protobuf",
@ -202,9 +202,21 @@
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
"Rev": "v1.0.1"
},
{
"ImportPath": "github.com/kr/pretty",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/kr/pty",
"Rev": "v1.1.5"
},
{
"ImportPath": "github.com/kr/text",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/mailru/easyjson",
"Rev": "60711f1a8329"
"Rev": "94de47d64c63"
},
{
"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
@ -284,7 +296,7 @@
},
{
"ImportPath": "github.com/stretchr/objx",
"Rev": "v0.1.1"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/stretchr/testify",
@ -356,7 +368,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "20d25e280405"
"Rev": "788fd7840127"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@ -388,19 +400,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "95846d7ef82a"
"Rev": "acea843d18eb"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "961b39a1baa0"
"Rev": "bc5732d141a8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "2c6e35a5b9cf"
"Rev": "11059204e07c"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "dd74dcc4bb91"
"Rev": "327675bd8ec3"
},
{
"ImportPath": "k8s.io/klog",

17
go.mod
View File

@ -52,10 +52,10 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.2
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20190627205229-acea843d18eb
k8s.io/apimachinery v0.0.0-20190627205106-bc5732d141a8
k8s.io/client-go v0.0.0-20190627205436-11059204e07c
k8s.io/component-base v0.0.0-20190627205834-327675bd8ec3
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
@ -70,9 +70,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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/api => k8s.io/api v0.0.0-20190627205229-acea843d18eb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190627205106-bc5732d141a8
k8s.io/client-go => k8s.io/client-go v0.0.0-20190627205436-11059204e07c
k8s.io/component-base => k8s.io/component-base v0.0.0-20190627205834-327675bd8ec3
)

4
go.sum
View File

@ -197,6 +197,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=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190627205229-acea843d18eb/go.mod h1:dNIey7Yoxc4u51YMhX4E5Cs6xiuGvXIGghzAZ9RzR88=
k8s.io/apimachinery v0.0.0-20190627205106-bc5732d141a8/go.mod h1:T1Vra67tZppnhHB3gqfn8/pmTb9EMVZXLvaevIRo6cU=
k8s.io/client-go v0.0.0-20190627205436-11059204e07c/go.mod h1:bEK8WFVy0Z0hvIzC2kqoZwu2H95SMfMkn5LL5H0Uh3U=
k8s.io/component-base v0.0.0-20190627205834-327675bd8ec3/go.mod h1:as4tTcrmc+XxLUusVFlo7RKdQjtqIN7PViXr9BWmwrU=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=