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

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 af9424d2c9
commit c883d6c994
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -234,10 +234,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"
@ -380,7 +376,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",
@ -520,7 +516,7 @@
}, },
{ {
"ImportPath": "github.com/stretchr/objx", "ImportPath": "github.com/stretchr/objx",
"Rev": "v0.2.0" "Rev": "v0.1.1"
}, },
{ {
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
@ -708,19 +704,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": "4e3d56081793" "Rev": "ae85206fc58c"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "460e8c72807d" "Rev": "873d5fac2edc"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -732,7 +728,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

@ -40,10 +40,10 @@ require (
google.golang.org/grpc v1.27.1 google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
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/component-base v0.0.0 k8s.io/component-base v0.0.0-20210518111224-873d5fac2edc
k8s.io/klog/v2 v2.8.0 k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
@ -53,9 +53,8 @@ require (
) )
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/apiserver => ../apiserver k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c
k8s.io/client-go => ../client-go k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111224-873d5fac2edc
k8s.io/component-base => ../component-base
) )

8
go.sum
View File

@ -594,6 +594,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
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/component-base v0.0.0-20210518111224-873d5fac2edc h1:l8dXdnxBZWoO8Fj65CMQvYsZ4cEggM3tz4Cu4LhkZoQ=
k8s.io/component-base v0.0.0-20210518111224-873d5fac2edc/go.mod h1:ymQYdNBH0dq2yRw/5R5jN9wKhQTkhOiDQqFKmycAwRk=
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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=