Merge pull request #85223 from sttts/sttts-crd-items-types

apiextensions: fix items+type logic in API due to broken go-openapi validation

Kubernetes-commit: 976712556e4bd22d5312a0af36b18127c709d54a
This commit is contained in:
Kubernetes Publisher 2019-11-20 14:23:19 -08:00
parent 01bbecf3b2
commit d454fe8177
3 changed files with 20 additions and 17 deletions

16
Godeps/Godeps.json generated
View File

@ -100,11 +100,11 @@
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "v0.19.2"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "v0.19.2"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/swag",
@ -212,7 +212,7 @@
},
{
"ImportPath": "github.com/mailru/easyjson",
"Rev": "b2ccc519800e"
"Rev": "v0.7.0"
},
{
"ImportPath": "github.com/modern-go/concurrent",
@ -264,7 +264,7 @@
},
{
"ImportPath": "github.com/stretchr/testify",
"Rev": "v1.3.0"
"Rev": "v1.4.0"
},
{
"ImportPath": "go.opencensus.io",
@ -372,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "bbc9463b57e5"
"Rev": "11707872ac1c"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "3c7067801da2"
"Rev": "41065c7a8c2a"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "0a8a1d7b7fae"
"Rev": "571c0ef67034"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "2a85f169f05f"
"Rev": "c4c8f8345c7e"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,19 +5,18 @@ 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-20191121015604-11707872ac1c
k8s.io/apimachinery v0.0.0-20191121015412-41065c7a8c2a
k8s.io/client-go v0.0.0-20191121015835-571c0ef67034
k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e
k8s.io/klog v1.0.0
)
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 => ../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-20191121015604-11707872ac1c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191121015412-41065c7a8c2a
k8s.io/client-go => k8s.io/client-go v0.0.0-20191121015835-571c0ef67034
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e
)

4
go.sum
View File

@ -220,6 +220,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/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-20191121015604-11707872ac1c/go.mod h1:R/s4gKT0V/cWEnbQa9taNRJNbWUK57/Dx6cPj6MD3A0=
k8s.io/apimachinery v0.0.0-20191121015412-41065c7a8c2a/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
k8s.io/client-go v0.0.0-20191121015835-571c0ef67034/go.mod h1:Adhj+OyDRsEXTnL9BfL7xbLWGWMCqGLWpMqGHkZI4J8=
k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=