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 4b4a361452
commit d74557ff95
3 changed files with 29 additions and 14 deletions

22
Godeps/Godeps.json generated
View File

@ -98,6 +98,18 @@
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.6"
},
{
"ImportPath": "github.com/kr/pretty",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/kr/pty",
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/kr/text",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/modern-go/concurrent",
"Rev": "bacd9c7ef1dd"
@ -200,7 +212,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "20d25e280405"
"Rev": "788fd7840127"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@ -220,19 +232,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/code-generator",
"Rev": "d55040311883"
"Rev": "86aa6a6a5cf3"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator 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/code-generator v0.0.0-20190627204931-86aa6a6a5cf3
k8s.io/klog v0.3.1
)
@ -19,9 +19,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/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
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/code-generator => k8s.io/code-generator v0.0.0-20190627204931-86aa6a6a5cf3
)

4
go.sum
View File

@ -103,6 +103,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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/code-generator v0.0.0-20190627204931-86aa6a6a5cf3/go.mod h1:LW1Oz5h6RtOZeuEaw3xeuhQW1eYbuGPrbLNQ+hm+SDg=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=