From 3d77c7c64810cdb3985537525a1969875b82ae43 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 7 Mar 2023 16:14:54 -0800 Subject: [PATCH 1/2] Update kube-openapi to 15aac26d736a Kubernetes-commit: 9bbdb9f130516a14a73914d0b41396ddb72a88ea --- go.mod | 11 ++++++----- go.sum | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 8cb4e2c0..e9c04582 100644 --- a/go.mod +++ b/go.mod @@ -24,10 +24,10 @@ require ( golang.org/x/term v0.5.0 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.1 - k8s.io/api v0.0.0-20230308234233-a4afee70a903 - k8s.io/apimachinery v0.0.0-20230303235435-f357b1fa74b7 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 k8s.io/klog/v2 v2.90.1 - k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d + k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd sigs.k8s.io/structured-merge-diff/v4 v4.2.3 @@ -59,6 +59,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230308234233-a4afee70a903 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230303235435-f357b1fa74b7 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 761fbd55..16a46e9c 100644 --- a/go.sum +++ b/go.sum @@ -473,14 +473,10 @@ 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-20230308234233-a4afee70a903 h1:TmxUf1tDcGUHE8qZKLRWmn2nr2FypkwvqC2qviOUmQc= -k8s.io/api v0.0.0-20230308234233-a4afee70a903/go.mod h1:esKbT+6XB9TZUHyxlJVQ3zUM0abhQZ81Ic68eirO+xM= -k8s.io/apimachinery v0.0.0-20230303235435-f357b1fa74b7 h1:YN43Lvs3Pj9iQmuWGojeBiFdz1mkrxe0EZn7Ba3TMpQ= -k8s.io/apimachinery v0.0.0-20230303235435-f357b1fa74b7/go.mod h1:jlJwObMa4oKAEOMnAeEaqeiM+Fwd/CbAwNyQ7OaEwS0= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU= -k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= +k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg= +k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From e2867f9cdc7128fe0ae8bd8604eb30e5c2007f47 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 29 Dec 2022 12:12:33 -0800 Subject: [PATCH 2/2] Update kubernetes code for minor API changes to kube-openapi Kubernetes-commit: 88ec8fba32f0ef7b768ec528cfbe44046877ea34 --- util/testing/fake_openapi_handler.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/util/testing/fake_openapi_handler.go b/util/testing/fake_openapi_handler.go index b957b420..a7b0d590 100644 --- a/util/testing/fake_openapi_handler.go +++ b/util/testing/fake_openapi_handler.go @@ -50,12 +50,8 @@ func NewFakeOpenAPIV3Server(specsPath string) (*FakeOpenAPIServer, error) { } server := httptest.NewServer(mux) - openAPIVersionedService, err := handler3.NewOpenAPIService(nil) - if err != nil { - return nil, err - } - - err = openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) + openAPIVersionedService := handler3.NewOpenAPIService() + err := openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) if err != nil { return nil, err }