From e461ee1f4ca0d36086d09a2c1d6ec9602a26d40d Mon Sep 17 00:00:00 2001 From: Abhishek Kr Srivastav Date: Thu, 12 Sep 2024 18:15:22 +0530 Subject: [PATCH 1/3] Fix Go vet errors for master golang Co-authored-by: Rajalakshmi-Girish Co-authored-by: Abhishek Kr Srivastav Kubernetes-commit: 5bf390ad00287ee0cb939376bd9151ea402b59b6 --- rest/client_test.go | 2 +- tools/remotecommand/v4.go | 2 +- transport/cache_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest/client_test.go b/rest/client_test.go index 6ba9e7388c..ebb35c5090 100644 --- a/rest/client_test.go +++ b/rest/client_test.go @@ -299,7 +299,7 @@ func TestHTTPProxy(t *testing.T) { })) defer testProxyServer.Close() - t.Logf(testProxyServer.URL) + t.Log(testProxyServer.URL) u, err := url.Parse(testProxyServer.URL) if err != nil { diff --git a/tools/remotecommand/v4.go b/tools/remotecommand/v4.go index 69ca934a0d..6146bdf12a 100644 --- a/tools/remotecommand/v4.go +++ b/tools/remotecommand/v4.go @@ -115,5 +115,5 @@ func (d *errorDecoderV4) decode(message []byte) error { return errors.New("error stream protocol error: unknown error") } - return fmt.Errorf(status.Message) + return errors.New(status.Message) } diff --git a/transport/cache_test.go b/transport/cache_test.go index f2e455ccb0..54705276d0 100644 --- a/transport/cache_test.go +++ b/transport/cache_test.go @@ -159,7 +159,7 @@ func TestTLSConfigKey(t *testing.T) { shouldCacheA := valueA.Proxy == nil if shouldCacheA != canCacheA { - t.Errorf("Unexpected canCache=false for " + nameA) + t.Error("Unexpected canCache=false for " + nameA) } configIsNotEmpty := !reflect.DeepEqual(*valueA, Config{}) From 7811788aa5af3a6b1bef48d8b8cbab0e3aa2bd60 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 22 Jan 2025 07:14:37 -0800 Subject: [PATCH 2/3] 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 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5522226afb..df17d285ae 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( golang.org/x/term v0.18.0 golang.org/x/time v0.3.0 google.golang.org/protobuf v1.33.0 - k8s.io/api v0.0.0-20240404161350-448db12cecfb + k8s.io/api v0.0.0-20240729132826-403c8539e45f k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625 k8s.io/klog/v2 v2.110.1 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 diff --git a/go.sum b/go.sum index dc319d8710..a485b5be6f 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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-20240404161350-448db12cecfb h1:/uYBtjPF21kf1qLyVVXGQOcFcjjqGowAssqopfbjQB0= -k8s.io/api v0.0.0-20240404161350-448db12cecfb/go.mod h1:dPhF9d7Kl/mI8T1SzZBp2/saFzES5J24O1PGAwNajB0= +k8s.io/api v0.0.0-20240729132826-403c8539e45f h1:qjIlRtcOjihNAb4DcEqQZrGA6eV+MvV5nFUg8tOa1xg= +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/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= From 5dc33244556b141c3b6eeffaabcd6e5d29d6f70a Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 13 Feb 2025 12:08:57 +0000 Subject: [PATCH 3/3] Update dependencies to v0.29.14 tag --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index df17d285ae..921025c5b8 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( golang.org/x/term v0.18.0 golang.org/x/time v0.3.0 google.golang.org/protobuf v1.33.0 - k8s.io/api v0.0.0-20240729132826-403c8539e45f - k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625 + k8s.io/api v0.29.14 + k8s.io/apimachinery v0.29.14 k8s.io/klog/v2 v2.110.1 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 k8s.io/utils v0.0.0-20230726121419-3b25d923346b diff --git a/go.sum b/go.sum index a485b5be6f..692c3509f2 100644 --- a/go.sum +++ b/go.sum @@ -153,10 +153,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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-20240729132826-403c8539e45f h1:qjIlRtcOjihNAb4DcEqQZrGA6eV+MvV5nFUg8tOa1xg= -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/api v0.29.14 h1:JWFh5ufowH3Y6tCgEzY3URVJHb27f0tEDEej0nCjWDw= +k8s.io/api v0.29.14/go.mod h1:IV8YqKxMm8JGLBLlHM13Npn5lCITH10XYipWEW+YEOQ= +k8s.io/apimachinery v0.29.14 h1:IDhwnGNCp836SLOwW1SoEfFNV77wxIklhxeAHX9vmSo= +k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=