Merge pull request #101234 from gautierdelorme/rm-go-openapi-spec

eliminate dependency on go-openapi/spec

Kubernetes-commit: 565d5f456242fcc79b7540a4c4913c7577cbfc7d
This commit is contained in:
Kubernetes Publisher 2021-04-21 06:18:10 -07:00
parent d3a409a6ff
commit d7993ed192
3 changed files with 23 additions and 20 deletions

18
Godeps/Godeps.json generated
View File

@ -162,10 +162,6 @@
"ImportPath": "github.com/go-openapi/jsonreference", "ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "v0.19.3" "Rev": "v0.19.3"
}, },
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "v0.19.5"
},
{ {
"ImportPath": "github.com/go-openapi/swag", "ImportPath": "github.com/go-openapi/swag",
"Rev": "v0.19.5" "Rev": "v0.19.5"
@ -272,7 +268,7 @@
}, },
{ {
"ImportPath": "github.com/kr/pty", "ImportPath": "github.com/kr/pty",
"Rev": "v1.1.5" "Rev": "v1.1.1"
}, },
{ {
"ImportPath": "github.com/kr/text", "ImportPath": "github.com/kr/text",
@ -352,7 +348,7 @@
}, },
{ {
"ImportPath": "github.com/stretchr/objx", "ImportPath": "github.com/stretchr/objx",
"Rev": "v0.2.0" "Rev": "v0.1.0"
}, },
{ {
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
@ -480,19 +476,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "e993e0004b6d" "Rev": "b64c6b5ea77c"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "37b6f01a7c3f" "Rev": "f3a344a9640c"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "bfec2914ea57" "Rev": "ae85206fc58c"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "dd2ded1d0f40" "Rev": "cbf249e0c797"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -504,7 +500,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",
"Rev": "1a6458611d18" "Rev": "95288971da7e"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16 go 1.16
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20210518101555-b64c6b5ea77c
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20210518095631-cbf249e0c797
k8s.io/klog/v2 v2.8.0 k8s.io/klog/v2 v2.8.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210518101555-b64c6b5ea77c
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210518095631-cbf249e0c797
k8s.io/sample-controller => ../sample-controller
) )

8
go.sum
View File

@ -426,6 +426,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210518101555-b64c6b5ea77c h1:UKWH16VfbGANijR6vN0rRuSX6ua0JsmWw4y1y2bA0TA=
k8s.io/api v0.0.0-20210518101555-b64c6b5ea77c/go.mod h1:XAKoutoISH8fQ++BLv5O5gKGpZHoBcQoUKE1SaFlcZc=
k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c h1:Ow/BjHSawZF4mTos3y4rN/sCIpUwGf9loxsyiVKGk+g=
k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c h1:uwVGBydk6kvokuc5xUUqACEJ5boOhkhE6m5XF0lNClU=
k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c/go.mod h1:TIT0Nhjy4Ca/+JzqsvJna+RDfBh6RBRfcF6/dmID9HU=
k8s.io/code-generator v0.0.0-20210518095631-cbf249e0c797 h1:ti267WOxwFGe9ajr9jvoXEpUiEGXsA51olRyM3S3P4w=
k8s.io/code-generator v0.0.0-20210518095631-cbf249e0c797/go.mod h1:tHNeGA58jE3nJvZLDN0c/5k7P3NlYdjbWuJYK9QiU3s=
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/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=