From 30571358f578eabf5ca12499543c50c4b1263653 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 2 Jun 2022 10:03:29 -0400 Subject: [PATCH] Switch to v3 of github.com/emicklei/go-restful Signed-off-by: Davanum Srinivas Kubernetes-commit: ab690750df1d27409d31fd270d77b4390bac4431 --- go.mod | 21 +++++++++++---------- go.sum | 19 ++++++------------- pkg/endpoints/apiserver_test.go | 2 +- pkg/endpoints/discovery/group.go | 2 +- pkg/endpoints/discovery/legacy.go | 2 +- pkg/endpoints/discovery/root.go | 2 +- pkg/endpoints/discovery/version.go | 2 +- pkg/endpoints/groupversion.go | 2 +- pkg/endpoints/installer.go | 2 +- pkg/endpoints/metrics/metrics.go | 2 +- pkg/endpoints/openapi/openapi.go | 2 +- pkg/endpoints/warning/warning.go | 2 +- pkg/server/handler.go | 2 +- pkg/server/routes/openapi.go | 2 +- pkg/server/routes/version.go | 2 +- 15 files changed, 30 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index a000e363e..b57af9281 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-systemd/v22 v22.3.2 github.com/davecgh/go-spew v1.1.1 - github.com/emicklei/go-restful v2.9.5+incompatible + github.com/emicklei/go-restful/v3 v3.7.5-0.20220308211933-7c971ca4d0fd github.com/evanphx/json-patch v4.12.0+incompatible github.com/fsnotify/fsnotify v1.4.9 github.com/gogo/protobuf v1.3.2 @@ -38,12 +38,12 @@ require ( google.golang.org/grpc v1.44.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0-20220531234821-832b1f4dc5da - k8s.io/apimachinery v0.0.0-20220527204257-be3a79b26814 - k8s.io/client-go v0.0.0-20220530124808-f88de91ae5c1 - k8s.io/component-base v0.0.0-20220531235246-ba9c052508ce + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.60.1 - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 + k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 @@ -119,8 +119,9 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220531234821-832b1f4dc5da - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220527204257-be3a79b26814 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220530124808-f88de91ae5c1 - k8s.io/component-base => k8s.io/component-base v0.0.0-20220531235246-ba9c052508ce + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base ) diff --git a/go.sum b/go.sum index 9f589785e..384423c2b 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -117,9 +119,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.7.5-0.20220308211933-7c971ca4d0fd h1:iKIUl3SetleviJ07WJdKqdvVBzmfYgaADXHHrONYPOY= +github.com/emicklei/go-restful/v3 v3.7.5-0.20220308211933-7c971ca4d0fd/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -911,21 +912,13 @@ 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-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220531234821-832b1f4dc5da h1:lYt0O6S+waScMQNgNQSfPQOCtnjyL5w5i3X1a/ApQho= -k8s.io/api v0.0.0-20220531234821-832b1f4dc5da/go.mod h1:HcGtQRVUegP+lMiLiFI6ZTH8Gh2YLabQpXOnknalcVI= -k8s.io/apimachinery v0.0.0-20220527204257-be3a79b26814 h1:RvbQKYWzCfqGUeyc9Q4mR3TKLlzcygwItRsElVpf3BQ= -k8s.io/apimachinery v0.0.0-20220527204257-be3a79b26814/go.mod h1:1oBVxgNUfLl978lJAlywA+H45m2ctSuqJU2stpbcjT4= -k8s.io/client-go v0.0.0-20220530124808-f88de91ae5c1 h1:BVUIe0zBQAxxmF44zVLf0exBG5g4sNHfgCIMJNnQyYw= -k8s.io/client-go v0.0.0-20220530124808-f88de91ae5c1/go.mod h1:aQ4aGSZhXBz/nxbhxf+vd3Y6JvHVWxkHHL5r2BD/DDo= -k8s.io/component-base v0.0.0-20220531235246-ba9c052508ce h1:F6Ee80Y4zrtMZrAV2Xcza/GnkLC9gtinQpgPzaCLSUo= -k8s.io/component-base v0.0.0-20220531235246-ba9c052508ce/go.mod h1:jZ2zT6z0+ywhdMBBRMkNB3I24RyidF99eCRGb7lMqVg= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60 h1:cE/M8rmDQgibspuSm+X1iW16ByTImtEaapgaHoVSLX4= +k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60/go.mod h1:ouUzE1U2mEv//HRoBwYLFE5pdqjIebvtX361vtEIlBI= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go index e9659bb47..1c4c2fb66 100644 --- a/pkg/endpoints/apiserver_test.go +++ b/pkg/endpoints/apiserver_test.go @@ -37,7 +37,7 @@ import ( "testing" "time" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" fuzzer "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/endpoints/discovery/group.go b/pkg/endpoints/discovery/group.go index 7e9927a3a..1650a5273 100644 --- a/pkg/endpoints/discovery/group.go +++ b/pkg/endpoints/discovery/group.go @@ -19,7 +19,7 @@ package discovery import ( "net/http" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/discovery/legacy.go b/pkg/endpoints/discovery/legacy.go index b33ecec65..93fdfddf0 100644 --- a/pkg/endpoints/discovery/legacy.go +++ b/pkg/endpoints/discovery/legacy.go @@ -19,7 +19,7 @@ package discovery import ( "net/http" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/discovery/root.go b/pkg/endpoints/discovery/root.go index beba9c8a4..0fe6be56b 100644 --- a/pkg/endpoints/discovery/root.go +++ b/pkg/endpoints/discovery/root.go @@ -20,7 +20,7 @@ import ( "net/http" "sync" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/discovery/version.go b/pkg/endpoints/discovery/version.go index 0976041bf..4caedbada 100644 --- a/pkg/endpoints/discovery/version.go +++ b/pkg/endpoints/discovery/version.go @@ -19,7 +19,7 @@ package discovery import ( "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/groupversion.go b/pkg/endpoints/groupversion.go index 94b1788ef..d7f85106e 100644 --- a/pkg/endpoints/groupversion.go +++ b/pkg/endpoints/groupversion.go @@ -20,7 +20,7 @@ import ( "path" "time" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go index e4b2221fc..43a84274a 100644 --- a/pkg/endpoints/installer.go +++ b/pkg/endpoints/installer.go @@ -25,7 +25,7 @@ import ( "time" "unicode" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/metrics/metrics.go b/pkg/endpoints/metrics/metrics.go index cb37ae21a..4f851bb4a 100644 --- a/pkg/endpoints/metrics/metrics.go +++ b/pkg/endpoints/metrics/metrics.go @@ -25,7 +25,7 @@ import ( "sync" "time" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/types" utilsets "k8s.io/apimachinery/pkg/util/sets" diff --git a/pkg/endpoints/openapi/openapi.go b/pkg/endpoints/openapi/openapi.go index b1f53df0d..e61f44439 100644 --- a/pkg/endpoints/openapi/openapi.go +++ b/pkg/endpoints/openapi/openapi.go @@ -24,7 +24,7 @@ import ( "strings" "unicode" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/endpoints/warning/warning.go b/pkg/endpoints/warning/warning.go index c0dde6e06..512fa5def 100644 --- a/pkg/endpoints/warning/warning.go +++ b/pkg/endpoints/warning/warning.go @@ -17,7 +17,7 @@ limitations under the License. package warning import ( - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "k8s.io/apiserver/pkg/warning" ) diff --git a/pkg/server/handler.go b/pkg/server/handler.go index 23b72a3ac..be52f81e0 100644 --- a/pkg/server/handler.go +++ b/pkg/server/handler.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "k8s.io/klog/v2" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/server/routes/openapi.go b/pkg/server/routes/openapi.go index 44e463532..e6459ce3e 100644 --- a/pkg/server/routes/openapi.go +++ b/pkg/server/routes/openapi.go @@ -17,7 +17,7 @@ limitations under the License. package routes import ( - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "k8s.io/klog/v2" "k8s.io/apiserver/pkg/server/mux" diff --git a/pkg/server/routes/version.go b/pkg/server/routes/version.go index dd9ab0dcf..d2235f2ee 100644 --- a/pkg/server/routes/version.go +++ b/pkg/server/routes/version.go @@ -19,7 +19,7 @@ package routes import ( "net/http" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"