Merge pull request #95954 from sttts/sttts-go-openapi

apiextensions: replace go-openapi with kube-openapi fork for validation

Kubernetes-commit: 0cba30d891cb77e813d7f19dcc5ae422076fcfe3
This commit is contained in:
Kubernetes Publisher 2020-11-09 07:18:27 -08:00
parent be00baa5eb
commit bef66adadf
3 changed files with 27 additions and 18 deletions

34
Godeps/Godeps.json generated
View File

@ -72,11 +72,15 @@
},
{
"ImportPath": "github.com/PuerkitoBio/purell",
"Rev": "v1.0.0"
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/PuerkitoBio/urlesc",
"Rev": "5bd2802263f2"
"Rev": "de5bf2ad4578"
},
{
"ImportPath": "github.com/asaskevich/govalidator",
"Rev": "f61b66f89f4a"
},
{
"ImportPath": "github.com/census-instrumentation/opencensus-proto",
@ -156,19 +160,19 @@
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "46af16f9f7b1"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "13c6e3589ad9"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "6aced65f8501"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "1d0bd113de87"
"Rev": "v0.19.5"
},
{
"ImportPath": "github.com/gogo/protobuf",
@ -268,7 +272,7 @@
},
{
"ImportPath": "github.com/kr/pty",
"Rev": "v1.1.1"
"Rev": "v1.1.5"
},
{
"ImportPath": "github.com/kr/text",
@ -276,7 +280,11 @@
},
{
"ImportPath": "github.com/mailru/easyjson",
"Rev": "d5b7844b561a"
"Rev": "b2ccc519800e"
},
{
"ImportPath": "github.com/mitchellh/mapstructure",
"Rev": "v1.1.2"
},
{
"ImportPath": "github.com/modern-go/concurrent",
@ -332,7 +340,7 @@
},
{
"ImportPath": "github.com/stretchr/objx",
"Rev": "v0.1.0"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/stretchr/testify",
@ -448,11 +456,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3e589e9d21e6"
"Rev": "8519c5ea4619"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d67967d70958"
"Rev": "a787aaf5a782"
},
{
"ImportPath": "k8s.io/gengo",
@ -464,7 +472,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "8b5066479488"
"Rev": "74b467f3a622"
},
{
"ImportPath": "k8s.io/utils",
@ -476,7 +484,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "b3cf1e8ff931"
"Rev": "v4.0.2"
},
{
"ImportPath": "sigs.k8s.io/yaml",

9
go.mod
View File

@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20201109162247-8519c5ea4619
k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201104234853-8146046b121e
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20201109162247-8519c5ea4619
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
)

2
go.sum
View File

@ -347,6 +347,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20201109162247-8519c5ea4619/go.mod h1:AiM5F9qdfCDp1n0rr9MoS0bqFKMZzQIlbuUQUK5WcU4=
k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=