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 bf96ec7e3a
commit 1ca09534fe
3 changed files with 32 additions and 25 deletions

24
Godeps/Godeps.json generated
View File

@ -278,10 +278,6 @@
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "v0.19.5"
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "v0.19.5"
@ -500,7 +496,7 @@
},
{
"ImportPath": "github.com/kr/pty",
"Rev": "v1.1.5"
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/kr/text",
@ -728,7 +724,7 @@
},
{
"ImportPath": "github.com/stretchr/objx",
"Rev": "v0.2.0"
"Rev": "v0.1.1"
},
{
"ImportPath": "github.com/stretchr/testify",
@ -924,31 +920,31 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "e993e0004b6d"
"Rev": "b64c6b5ea77c"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "37b6f01a7c3f"
"Rev": "f3a344a9640c"
},
{
"ImportPath": "k8s.io/apiserver",
"Rev": "0be3b216342a"
"Rev": "c883d6c994d8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bfec2914ea57"
"Rev": "ae85206fc58c"
},
{
"ImportPath": "k8s.io/cloud-provider",
"Rev": "0a72310bf7cd"
"Rev": "47f9b35f4916"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "460e8c72807d"
"Rev": "873d5fac2edc"
},
{
"ImportPath": "k8s.io/controller-manager",
"Rev": "49c7a765ff0f"
"Rev": "7ae91168ebde"
},
{
"ImportPath": "k8s.io/gengo",
@ -960,7 +956,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "1a6458611d18"
"Rev": "95288971da7e"
},
{
"ImportPath": "k8s.io/utils",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c
k8s.io/cloud-provider v0.0.0-20210518132958-47f9b35f4916
k8s.io/controller-manager v0.0.0-20210518132418-7ae91168ebde
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20210518101555-b64c6b5ea77c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100450-f3a344a9640c
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210518112727-c883d6c994d8
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210518132958-47f9b35f4916
k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111224-873d5fac2edc
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210518132418-7ae91168ebde
)

12
go.sum
View File

@ -597,6 +597,18 @@ 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.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
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/apiserver v0.0.0-20210518112727-c883d6c994d8/go.mod h1:XeeHmqyPuR8uLExOWdhC3KeNIflZu76YdfloBl6bN/s=
k8s.io/client-go v0.0.0-20210518102854-ae85206fc58c/go.mod h1:TIT0Nhjy4Ca/+JzqsvJna+RDfBh6RBRfcF6/dmID9HU=
k8s.io/cloud-provider v0.0.0-20210518132958-47f9b35f4916 h1:z+Q1OySH1tTjhLuVRPxkXUHAc5sQrbyV+gLzqpqZyo0=
k8s.io/cloud-provider v0.0.0-20210518132958-47f9b35f4916/go.mod h1:ufVsRfRNSilPZi43Bov3UmwaTxH8HgaEP6IiU6h5g0s=
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/controller-manager v0.0.0-20210518132418-7ae91168ebde h1:xdmuPZFnxrTB0qpWD4TPxchANiZWJjt+vFfTuUhVXMo=
k8s.io/controller-manager v0.0.0-20210518132418-7ae91168ebde/go.mod h1:1BuX4MgMoFNmoOcv/ViPQ3JVERmjFh9MYZEp/tX3Hz8=
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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=