diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go index ef14fee5f..646820cbc 100644 --- a/discovery/discovery_client.go +++ b/discovery/discovery_client.go @@ -29,9 +29,8 @@ import ( "sync" "time" - //nolint:staticcheck // SA1019 Keep using module since it's still being maintained and the api of google.golang.org/protobuf/proto differs - "github.com/golang/protobuf/proto" openapi_v2 "github.com/google/gnostic-models/openapiv2" + "google.golang.org/protobuf/proto" apidiscoveryv2 "k8s.io/api/apidiscovery/v2" apidiscoveryv2beta1 "k8s.io/api/apidiscovery/v2beta1" diff --git a/go.mod b/go.mod index f45e5dc28..130bde65f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ godebug winsymlink=0 require ( github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.5.4 github.com/google/gnostic-models v0.6.8 github.com/google/go-cmp v0.6.0 github.com/google/gofuzz v1.2.0 @@ -28,8 +27,8 @@ require ( golang.org/x/time v0.7.0 google.golang.org/protobuf v1.35.1 gopkg.in/evanphx/json-patch.v4 v4.12.0 - k8s.io/api v0.0.0-20241213094710-075bd98ca2a4 - k8s.io/apimachinery v0.0.0-20241213094412-7249ce11e455 + k8s.io/api v0.0.0-20241213174810-855f46b651ee + k8s.io/apimachinery v0.0.0-20241213174434-cfa44a126e90 k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 @@ -47,6 +46,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect github.com/josharian/intern v1.0.0 // indirect diff --git a/go.sum b/go.sum index 6cd223c03..faf49a8f5 100644 --- a/go.sum +++ b/go.sum @@ -150,10 +150,10 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.0.0-20241213094710-075bd98ca2a4 h1:1cW7Ic/WXRaAbFDAbmtra9C7d2UUt5P127WBG8ijsOE= -k8s.io/api v0.0.0-20241213094710-075bd98ca2a4/go.mod h1:bgLmB9gxsff4S1tB//F/RWzcdq5Ti4YA78/sDVrSP3o= -k8s.io/apimachinery v0.0.0-20241213094412-7249ce11e455 h1:EpmRoNKEKpdJnnmcRdywZxc/8mQkpvtEqxfQMwjlr3k= -k8s.io/apimachinery v0.0.0-20241213094412-7249ce11e455/go.mod h1:1Ya4EscxtjDT7Rem+4gvp/C/+xs8jpJtJv7fyH0+Gzo= +k8s.io/api v0.0.0-20241213174810-855f46b651ee h1:WWGrsu1oX+PIojnolAoB8/aLmnUU0MUv/wV+AgKZ8Cc= +k8s.io/api v0.0.0-20241213174810-855f46b651ee/go.mod h1:qVRanebSXI0iPj2gXDP64njA69rwc1lGJAUC+IaX24I= +k8s.io/apimachinery v0.0.0-20241213174434-cfa44a126e90 h1:lovn4RlPSJolbPdyMjl56Sj9UpWoQJmONUCkrf5kPXg= +k8s.io/apimachinery v0.0.0-20241213174434-cfa44a126e90/go.mod h1:KDPQAeziTN7qt/3bXgtoWbjSIrXXrP//t0oWa0iC+fw= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=