Merge pull request #129519 from kishen-v/automated-cherry-pick-of-#127422-upstream-release-1.31

k8s-publishing-bot · k8s-publishing-bot · commit 6da0824ca0bb · 2025-01-22T21:04:17.000Z
Automated cherry pick of #127422: Fix Go vet errors for master golang

Kubernetes-commit: d7fc7e30cb630dab3351480c806c58a8c480156f
diff --git a/go.mod b/go.mod
@@ -47,7 +47,7 @@ require (
 	gopkg.in/square/go-jose.v2 v2.6.0
 	k8s.io/api v0.0.0-20240827081448-46f6230a4e83
 	k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe
-	k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9
+	k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c
 	k8s.io/component-base v0.0.0-20240801005513-6332889bcf10
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1
diff --git a/go.sum b/go.sum
@@ -374,8 +374,8 @@ k8s.io/api v0.0.0-20240827081448-46f6230a4e83 h1:EHuPy/62w9Llhp491zNknjEuET9oMPQ
 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/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/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/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/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
diff --git a/pkg/cel/lazy/lazy_test.go b/pkg/cel/lazy/lazy_test.go
@@ -60,7 +60,7 @@ func TestLazyMapType(t *testing.T) {
 		evalCounter++
 		v, err := compileAndRun(env, activation, `{"a": "a"}`)
 		if err != nil {
-			return types.NewErr(err.Error())
+			return types.NewErr("%s", err.Error())
 		}
 		return v
 	})
diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go
@@ -2818,7 +2818,7 @@ func TestDeleteWithOptions(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		t.Logf(string(s))
+		t.Log(string(s))
 	}
 	if simpleStorage.deleted != ID {
 		t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)
@@ -2858,7 +2858,7 @@ func TestDeleteWithOptionsQuery(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		t.Logf(string(s))
+		t.Log(string(s))
 	}
 	if simpleStorage.deleted != ID {
 		t.Fatalf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)
@@ -2901,7 +2901,7 @@ func TestDeleteWithOptionsQueryAndBody(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		t.Logf(string(s))
+		t.Log(string(s))
 	}
 	if simpleStorage.deleted != ID {
 		t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)
diff --git a/pkg/endpoints/handlers/responsewriters/writers_test.go b/pkg/endpoints/handlers/responsewriters/writers_test.go
@@ -326,7 +326,7 @@ func TestSerializeObject(t *testing.T) {
 			compressionEnabled: true,
 			statusCode:         http.StatusInternalServerError,
 			out:                smallPayload,
-			outErrs:            []error{fmt.Errorf(string(largePayload)), fmt.Errorf("bad2")},
+			outErrs:            []error{errors.New(string(largePayload)), errors.New("bad2")},
 			mediaType:          "application/json",
 			req: &http.Request{
 				Header: http.Header{
diff --git a/pkg/server/filters/maxinflight.go b/pkg/server/filters/maxinflight.go
@@ -50,7 +50,7 @@ var (
 func handleError(w http.ResponseWriter, r *http.Request, err error) {
 	errorMsg := fmt.Sprintf("Internal Server Error: %#v", r.RequestURI)
 	http.Error(w, errorMsg, http.StatusInternalServerError)
-	klog.Errorf(err.Error())
+	klog.Error(err.Error())
 }
 
 // requestWatermark is used to track maximal numbers of requests in a particular phase of handling
diff --git a/pkg/storage/cacher/cacher_whitebox_test.go b/pkg/storage/cacher/cacher_whitebox_test.go
@@ -1603,7 +1603,7 @@ func verifyEvents(t *testing.T, w watch.Interface, events []watch.Event, strictO
 			if !valid {
 				t.Logf("(called from line %d)", line)
 				for _, err := range errors {
-					t.Errorf(err)
+					t.Error(err)
 				}
 			}
 		}
diff --git a/pkg/util/peerproxy/peerproxy_handler.go b/pkg/util/peerproxy/peerproxy_handler.go
@@ -176,7 +176,7 @@ func (h *peerProxyHandler) WrapHandler(handler http.Handler) http.Handler {
 		// TODO: maintain locally serviceable GVRs somewhere so that we dont have to
 		// consult the storageversion-informed map for those
 		if len(serviceableByResp.peerEndpoints) == 0 {
-			klog.Errorf(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr))
+			klog.Error(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr))
 			handler.ServeHTTP(w, r)
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func TestLazyMapType(t *testing.T) {`
`60`	`60`	`evalCounter++`
`61`	`61`	v, err := compileAndRun(env, activation, `{"a": "a"}`)
`62`	`62`	`if err != nil {`
`63`		`- return types.NewErr(err.Error())`
	`63`	`+ return types.NewErr("%s", err.Error())`
`64`	`64`	`}`
`65`	`65`	`return v`
`66`	`66`	`})`
Original file line number	Diff line number	Diff line change
`@@ -2818,7 +2818,7 @@ func TestDeleteWithOptions(t *testing.T) {`
`2818`	`2818`	`if err != nil {`
`2819`	`2819`	`t.Fatalf("unexpected error: %v", err)`
`2820`	`2820`	`}`
`2821`		`- t.Logf(string(s))`
	`2821`	`+ t.Log(string(s))`
`2822`	`2822`	`}`
`2823`	`2823`	`if simpleStorage.deleted != ID {`
`2824`	`2824`	`t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)`
`@@ -2858,7 +2858,7 @@ func TestDeleteWithOptionsQuery(t *testing.T) {`
`2858`	`2858`	`if err != nil {`
`2859`	`2859`	`t.Fatalf("unexpected error: %v", err)`
`2860`	`2860`	`}`
`2861`		`- t.Logf(string(s))`
	`2861`	`+ t.Log(string(s))`
`2862`	`2862`	`}`
`2863`	`2863`	`if simpleStorage.deleted != ID {`
`2864`	`2864`	`t.Fatalf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)`
`@@ -2901,7 +2901,7 @@ func TestDeleteWithOptionsQueryAndBody(t *testing.T) {`
`2901`	`2901`	`if err != nil {`
`2902`	`2902`	`t.Fatalf("unexpected error: %v", err)`
`2903`	`2903`	`}`
`2904`		`- t.Logf(string(s))`
	`2904`	`+ t.Log(string(s))`
`2905`	`2905`	`}`
`2906`	`2906`	`if simpleStorage.deleted != ID {`
`2907`	`2907`	`t.Errorf("Unexpected delete: %s, expected %s", simpleStorage.deleted, ID)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ var (`
`50`	`50`	`func handleError(w http.ResponseWriter, r *http.Request, err error) {`
`51`	`51`	`errorMsg := fmt.Sprintf("Internal Server Error: %#v", r.RequestURI)`
`52`	`52`	`http.Error(w, errorMsg, http.StatusInternalServerError)`
`53`		`- klog.Errorf(err.Error())`
	`53`	`+ klog.Error(err.Error())`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// requestWatermark is used to track maximal numbers of requests in a particular phase of handling`
Original file line number	Diff line number	Diff line change
`@@ -1603,7 +1603,7 @@ func verifyEvents(t *testing.T, w watch.Interface, events []watch.Event, strictO`
`1603`	`1603`	`if !valid {`
`1604`	`1604`	`t.Logf("(called from line %d)", line)`
`1605`	`1605`	`for _, err := range errors {`
`1606`		`- t.Errorf(err)`
	`1606`	`+ t.Error(err)`
`1607`	`1607`	`}`
`1608`	`1608`	`}`
`1609`	`1609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (h *peerProxyHandler) WrapHandler(handler http.Handler) http.Handler {`
`176`	`176`	`// TODO: maintain locally serviceable GVRs somewhere so that we dont have to`
`177`	`177`	`// consult the storageversion-informed map for those`
`178`	`178`	`if len(serviceableByResp.peerEndpoints) == 0 {`
`179`		`- klog.Errorf(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr))`
	`179`	`+ klog.Error(fmt.Sprintf("GVR %v is not served by anything in this cluster", gvr))`
`180`	`180`	`handler.ServeHTTP(w, r)`
`181`	`181`	`return`
`182`	`182`	`}`