upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-05-28 04:35:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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 a8076971c0
commit 2c52ab8913
3 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Godeps/Godeps.json generated
View file

@ -114,6 +114,10 @@
"ImportPath": "github.com/armon/go-radix",
"Rev": "7fddfc383310"
},
{
"ImportPath": "github.com/asaskevich/govalidator",
"Rev": "f61b66f89f4a"
},
{
"ImportPath": "github.com/beorn7/perks",
"Rev": "v1.0.1"
@ -916,31 +920,31 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3e589e9d21e6"
"Rev": "8519c5ea4619"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d67967d70958"
"Rev": "a787aaf5a782"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "d37c4734ef0c"
"Rev": "eb5c5243d597"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a2cda5636dc9"
"Rev": "bef66adadf9a"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "3609764c976f"
"Rev": "ed440de59c89"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "6bedbf41e43b"
"Rev": "bf24d3ab5150"
},
{
"ImportPath": "k8s.io/component-helpers",
"Rev": "200b091cbf2c"
"Rev": "7624ab466412"
},
{
"ImportPath": "k8s.io/gengo",
@ -952,11 +956,11 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "8b5066479488"
"Rev": "74b467f3a622"
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "0371c18f5315"
"Rev": "9446cab9abd5"
},
{
"ImportPath": "k8s.io/utils",
@ -972,7 +976,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "b3cf1e8ff931"
"Rev": "v4.0.2"
},
{
"ImportPath": "sigs.k8s.io/yaml",

31
go.mod
View file

@ -34,28 +34,27 @@ require (
github.com/stretchr/testify v1.4.0
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20201109162247-8519c5ea4619
k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
k8s.io/cli-runtime v0.0.0-20201109164256-eb5c5243d597
k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a
k8s.io/component-base v0.0.0-20201109162948-bf24d3ab5150
k8s.io/component-helpers v0.0.0-20201109163048-7624ab466412
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20201109164148-9446cab9abd5
k8s.io/utils v0.0.0-20201104234853-8146046b121e
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20201109162247-8519c5ea4619
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201109164256-eb5c5243d597
k8s.io/client-go => k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201109161924-ed440de59c89
k8s.io/component-base => k8s.io/component-base v0.0.0-20201109162948-bf24d3ab5150
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201109163048-7624ab466412
k8s.io/metrics => k8s.io/metrics v0.0.0-20201109164148-9446cab9abd5
)

8
go.sum
View file

@ -551,6 +551,13 @@ 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/cli-runtime v0.0.0-20201109164256-eb5c5243d597/go.mod h1:QcW7rSTbJ/v2swz99jngC1z6PN7k3cPS83l2n2fPujg=
k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a/go.mod h1:9VsPQPe2J8dbpOmXX5TunLm7OmOxj+v+YY3F0EHC2yw=
k8s.io/code-generator v0.0.0-20201109161924-ed440de59c89/go.mod h1:wUyo2szs8ByJHpQTch9zvCFzf2nVOWUqIgaJeNbKmv4=
k8s.io/component-base v0.0.0-20201109162948-bf24d3ab5150/go.mod h1:9a/l6c9+/TG8whcyax/jEGzBk//tB/FtGhfn/UM3Exs=
k8s.io/component-helpers v0.0.0-20201109163048-7624ab466412/go.mod h1:zRJ/d+VRz0xzlfEvLF5WGtgphKa/UpRq2NW5NvDnj50=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -558,6 +565,7 @@ k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 h1:CJasJGBT+Atu2XLJHJ90GJBqW23sfBn4vtTlB/+aJJ4=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/metrics v0.0.0-20201109164148-9446cab9abd5/go.mod h1:76u1ApiaiiiPfMeqDmCWJlJ2B5oRtVjmk3nMdT36VME=
k8s.io/utils v0.0.0-20201104234853-8146046b121e h1:dUhh0zO/94tOe9DB05HFGE69ofectI1PBCmIxO612MI=
k8s.io/utils v0.0.0-20201104234853-8146046b121e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=