kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129524 from KeerthanaAP/automated-cherry-pick-of-#127422-upstream-release-1.29 

Automated cherry pick of #127422: Go vet fixes for gotip

Kubernetes-commit: 44397d45d18350f4abcc59b3046d1c8d824fbf8e
This commit is contained in:
Kubernetes Publisher 2025-01-22 07:14:37 -08:00
parent 26f00e33c1 d5e17212b7
commit 4209cb4f51
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -45,7 +45,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20240729132826-403c8539e45f
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce
k8s.io/client-go v0.0.0-20250122163452-7811788aa5af
k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb
k8s.io/klog/v2 v2.110.1
k8s.io/kms v0.0.0-20240404163946-358457739050

4
go.sum
View File

@ -397,8 +397,8 @@ k8s.io/api v0.0.0-20240729132826-403c8539e45f h1:qjIlRtcOjihNAb4DcEqQZrGA6eV+MvV
k8s.io/api v0.0.0-20240729132826-403c8539e45f/go.mod h1:AFqQkkEfmsUH52cPeKeWVm6eQZJUan7p62A0JEH+azM=
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625 h1:itYkKr52W3ugNsYoBZwpwcezu/vPxg3GK7XVkX24GAo=
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce h1:z43ZNSMgeAmGh1n7NYStCKb0ZzlJvZje79+PbHMcaRM=
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce/go.mod h1:WUmefL+57tMtrBz2EEfhBeTSndZv0F1xjA8LCWMs7/k=
k8s.io/client-go v0.0.0-20250122163452-7811788aa5af h1:4Dwm07XGnmefQbk1hNhcdpfQ6dtjiRWZZddGWN4dy5Q=
k8s.io/client-go v0.0.0-20250122163452-7811788aa5af/go.mod h1:fuuOsTguWaYPDO5nyygO0ws2TJyuGlk+c5Luxt26ZJc=
k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb h1:fwRjV6mSoBicYMk9toq/gR9OKejTTMLNz3GrpSxGiVQ=
k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb/go.mod h1:+gCwF0bpI48To/oAhk40oP3fMfzpjdTO4uKakcAhUfU=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=

2
pkg/cel/lazy/lazy_test.go
View File

@ -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
})

6
pkg/endpoints/apiserver_test.go
View File

@ -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)

2
pkg/endpoints/handlers/responsewriters/writers_test.go
View File

@ -329,7 +329,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{

2
pkg/server/filters/maxinflight.go
View File

@ -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

2
pkg/storage/cacher/cacher_whitebox_test.go
View File

@ -1342,7 +1342,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)
}
}
}

2
pkg/util/peerproxy/peerproxy_handler.go
View File

@ -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
}