Merge pull request #129519 from kishen-v/automated-cherry-pick-of-#12…

…7422-upstream-release-1.31

Automated cherry pick of #127422: Fix Go vet errors for master golang

Kubernetes-commit: d7fc7e30cb630dab3351480c806c58a8c480156f

go.mod

@@ -23,12 +23,12 @@ require (
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/evanphx/json-patch.v4 v4.12.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20240801003428-382a0912e579
-	k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe
-	k8s.io/apiserver v0.0.0-20240721200436-e749b346fa52
-	k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9
+	k8s.io/api v0.0.0-20240827081448-46f6230a4e83
+	k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe
+	k8s.io/apiserver v0.0.0-20250122210417-6da0824ca0bb
+	k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c
 	k8s.io/code-generator v0.0.0-20240801005206-f74ea3c4283b
-	k8s.io/component-base v0.0.0-20240726211132-95f30f136fb2
+	k8s.io/component-base v0.0.0-20240801005513-6332889bcf10
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
@@ -125,5 +125,3 @@ require (
 	k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
 )
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe

go.sum

@@ -365,18 +365,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20240801003428-382a0912e579 h1:pElFtnw6/eJb1SLes+tbAqfL/7IezesSZ1bLTO+b2UE=
-k8s.io/api v0.0.0-20240801003428-382a0912e579/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
+k8s.io/api v0.0.0-20240827081448-46f6230a4e83 h1:EHuPy/62w9Llhp491zNknjEuET9oMPQPPSAatwaM2NA=
+k8s.io/api v0.0.0-20240827081448-46f6230a4e83/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ=
 k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/apiserver v0.0.0-20240721200436-e749b346fa52 h1:6I6ehNH9nR6OVP6caK2O6jfwVRTZehQUs7C+OzGrMn4=
-k8s.io/apiserver v0.0.0-20240721200436-e749b346fa52/go.mod h1:evDFvWJ5AkEQ1nRZOHulw/OKntvjsYuxyZtZQNPhz5o=
-k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 h1:FtksMSsr8nNBmsSXlqvs3hPE/7BJ5wI/mJYjGypoEtk=
-k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9/go.mod h1:2bbCJ3Sd+yFlCoexz86XNKsJ8hBFUVTeHsjEhrODbfE=
+k8s.io/apiserver v0.0.0-20250122210417-6da0824ca0bb h1:IliNUHE9e0XqHEIj70FdXwOl2W0oJOKdIhFUSWrxBHc=
+k8s.io/apiserver v0.0.0-20250122210417-6da0824ca0bb/go.mod h1:Y3oSW149UWWLTwXHwxsrUleJwViLQBK49QhOus9jyiM=
+k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c h1:2KWIT9nRYHqRPUnJ7hPiWNRnvZjM29KezMf1jJHmS9w=
+k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c/go.mod h1:Ej+MeavJjLACzTBTUQxDzM/jq+XTcmChX/4PvmdDc9o=
 k8s.io/code-generator v0.0.0-20240801005206-f74ea3c4283b h1:aimzdOCy56Er8G846UyfiuYl79wuVHpQVUGRqr69sBU=
 k8s.io/code-generator v0.0.0-20240801005206-f74ea3c4283b/go.mod h1:XFrrotr+pmB82UFRqdX7NZUw3EoWDp6baNIZOdkUns8=
-k8s.io/component-base v0.0.0-20240726211132-95f30f136fb2 h1:WboNx0wmEPs9STUc0rzvjZDGwQehkG9IG5iZZzACSGE=
-k8s.io/component-base v0.0.0-20240726211132-95f30f136fb2/go.mod h1:f+bznChUGzOQayYeb6iDjbWSgV/69bOcWqS2qGVD3YQ=
+k8s.io/component-base v0.0.0-20240801005513-6332889bcf10 h1:tHph4IwKpAlb5BF1qvmAiZPsekcg7ulTIhHrGrw/OgY=
+k8s.io/component-base v0.0.0-20240801005513-6332889bcf10/go.mod h1:4BSQhq9G+cFOChP5FQhxewvI8nzmsOPyetLz/Gh2Npw=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=