kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 eec862e589
commit 970540f520
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Godeps/Godeps.json generated
View File

@ -110,6 +110,10 @@
"ImportPath": "github.com/armon/go-radix", "ImportPath": "github.com/armon/go-radix",
"Rev": "7fddfc383310" "Rev": "7fddfc383310"
}, },
{
"ImportPath": "github.com/asaskevich/govalidator",
"Rev": "f61b66f89f4a"
},
{ {
"ImportPath": "github.com/beorn7/perks", "ImportPath": "github.com/beorn7/perks",
"Rev": "v1.0.1" "Rev": "v1.0.1"
@ -900,31 +904,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "3e589e9d21e6" "Rev": "8519c5ea4619"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "d67967d70958" "Rev": "a787aaf5a782"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "333403406e47" "Rev": "584d80d8b454"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "a2cda5636dc9" "Rev": "bef66adadf9a"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "1e8752b7a2b6" "Rev": "b9de494c054c"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "6bedbf41e43b" "Rev": "bf24d3ab5150"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "1bc7b23cb00b" "Rev": "78d41a6b6b44"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -936,7 +940,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",
"Rev": "8b5066479488" "Rev": "74b467f3a622"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",
@ -952,7 +956,7 @@
}, },
{ {
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4", "ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "b3cf1e8ff931" "Rev": "v4.0.2"
}, },
{ {
"ImportPath": "sigs.k8s.io/yaml", "ImportPath": "sigs.k8s.io/yaml",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.15 go 1.15
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20201109164913-b9de494c054c
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20201109164815-78d41a6b6b44
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20201109162247-8519c5ea4619
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201109163323-584d80d8b454
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201109164913-b9de494c054c
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20201109162948-bf24d3ab5150
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201109164815-78d41a6b6b44
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

7
go.sum
View File

@ -567,6 +567,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-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.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 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/apiserver v0.0.0-20201109163323-584d80d8b454/go.mod h1:oICA4cCr62iq5naz012g3ZVLLmlTYkkz/Y+Ben7QiM4=
k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a/go.mod h1:9VsPQPe2J8dbpOmXX5TunLm7OmOxj+v+YY3F0EHC2yw=
k8s.io/cloud-provider v0.0.0-20201109164913-b9de494c054c/go.mod h1:WWZsmIUUMK74tYqIGmDVVLbB4I0Vk3pgyZHvpuzNBw4=
k8s.io/component-base v0.0.0-20201109162948-bf24d3ab5150/go.mod h1:9a/l6c9+/TG8whcyax/jEGzBk//tB/FtGhfn/UM3Exs=
k8s.io/controller-manager v0.0.0-20201109164815-78d41a6b6b44/go.mod h1:dcHwJFztwbFbNpJcgvZvkpRRtTPJ63phA+wNk3TQF9Y=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=