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 db54be1fc4
commit adb5ff01ff
3 changed files with 21 additions and 8 deletions

18
Godeps/Godeps.json generated
View File

@ -74,6 +74,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/matttproud/golang_protobuf_extensions",
"Rev": "v1.0.1"
@ -152,7 +164,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "20d25e280405"
"Rev": "788fd7840127"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@ -172,11 +184,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "961b39a1baa0"
"Rev": "bc5732d141a8"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "dd74dcc4bb91"
"Rev": "327675bd8ec3"
},
{
"ImportPath": "k8s.io/klog",

9
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-20190627205106-bc5732d141a8
k8s.io/component-base v0.0.0-20190627205834-327675bd8ec3
)
replace (
@ -15,7 +15,6 @@ 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/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190627205106-bc5732d141a8
k8s.io/component-base => k8s.io/component-base v0.0.0-20190627205834-327675bd8ec3
)

2
go.sum
View File

@ -65,6 +65,8 @@ 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/apimachinery v0.0.0-20190627205106-bc5732d141a8/go.mod h1:T1Vra67tZppnhHB3gqfn8/pmTb9EMVZXLvaevIRo6cU=
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/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=