From 8eee78a61f0826c41c90a7d6eefacf4da2ffe069 Mon Sep 17 00:00:00 2001 From: Sahil Raja Date: Mon, 21 Jun 2021 23:03:14 +0530 Subject: [PATCH 1/2] Update github.com/pkg/errors to go native errors pkg Signed-off-by: Sahil Raja --- pkg/kubelet/kubeletconfig/util/codec/codec.go | 3 +-- .../pluginmanager/operationexecutor/operation_generator.go | 4 ++-- pkg/kubelet/server/stats/handler.go | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/kubeletconfig/util/codec/codec.go b/pkg/kubelet/kubeletconfig/util/codec/codec.go index 37e8269106f..6f12c4671c5 100644 --- a/pkg/kubelet/kubeletconfig/util/codec/codec.go +++ b/pkg/kubelet/kubeletconfig/util/codec/codec.go @@ -19,7 +19,6 @@ package codec import ( "fmt" - "github.com/pkg/errors" "k8s.io/klog/v2" // ensure the core apis are installed @@ -95,7 +94,7 @@ func DecodeKubeletConfiguration(kubeletCodecs *serializer.CodecFactory, data []b // decoder, which has only v1beta1 registered, and log a warning. // The lenient path is to be dropped when support for v1beta1 is dropped. if !runtime.IsStrictDecodingError(err) { - return nil, errors.Wrap(err, "failed to decode") + return nil, fmt.Errorf("failed to decode: %w", err) } var lenientErr error diff --git a/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go b/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go index db6e8d41acb..3941d5de738 100644 --- a/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go +++ b/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go @@ -22,13 +22,13 @@ package operationexecutor import ( "context" + "errors" "fmt" "net" "time" "k8s.io/klog/v2" - "github.com/pkg/errors" "google.golang.org/grpc" "k8s.io/client-go/tools/record" registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" @@ -163,7 +163,7 @@ func (og *operationGenerator) notifyPlugin(client registerapi.RegistrationClient } if _, err := client.NotifyRegistrationStatus(ctx, status); err != nil { - return errors.Wrap(err, errStr) + return fmt.Errorf("%s: %w", errStr, err) } if errStr != "" { diff --git a/pkg/kubelet/server/stats/handler.go b/pkg/kubelet/server/stats/handler.go index 77e4fe7268c..0e6d90f4150 100644 --- a/pkg/kubelet/server/stats/handler.go +++ b/pkg/kubelet/server/stats/handler.go @@ -23,7 +23,6 @@ import ( restful "github.com/emicklei/go-restful" cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorv2 "github.com/google/cadvisor/info/v2" - "github.com/pkg/errors" "k8s.io/klog/v2" "k8s.io/api/core/v1" @@ -143,7 +142,7 @@ func (h *handler) handleSummary(request *restful.Request, response *restful.Resp onlyCPUAndMemory := false err := request.Request.ParseForm() if err != nil { - handleError(response, "/stats/summary", errors.Wrapf(err, "parse form failed")) + handleError(response, "/stats/summary", fmt.Errorf("parse form failed: %w", err)) return } if onlyCluAndMemoryParam, found := request.Request.Form["only_cpu_and_memory"]; found && From 992993257d8a0c92820cc45168c6024d748952c6 Mon Sep 17 00:00:00 2001 From: Sahil Raja Date: Wed, 23 Jun 2021 08:07:05 +0530 Subject: [PATCH 2/2] Removed usage of github.com/pkg/errors Signed-off-by: Sahil Raja --- pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go index a8fe529249a..ea5c80a95b5 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go @@ -17,12 +17,11 @@ limitations under the License. package configfiles import ( + "errors" "fmt" "path/filepath" "testing" - "github.com/pkg/errors" - apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" @@ -165,7 +164,7 @@ foo: bar`), } kc, err := loader.Load() - if c.strictErr && !runtime.IsStrictDecodingError(errors.Cause(err)) { + if c.strictErr && !runtime.IsStrictDecodingError(errors.Unwrap(err)) { t.Fatalf("got error: %v, want strict decoding error", err) } if utiltest.SkipRest(t, c.desc, err, c.err) {