From 4b1402187474a1ebd0f71c824f45448fea160fc6 Mon Sep 17 00:00:00 2001 From: youhonglian Date: Tue, 22 Jun 2021 11:54:56 +0800 Subject: [PATCH] update github.com/pkg/errors to go native errors pkg in staging --- staging/src/k8s.io/apiserver/go.mod | 1 - .../apiserver/pkg/util/flowcontrol/apf_controller.go | 7 +++---- .../pkg/util/flowcontrol/fairqueuing/queueset/queueset.go | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 10e28f10f84..db93d10de3a 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -23,7 +23,6 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/golang-lru v0.5.1 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/pkg/errors v0.9.1 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go index fe120eaaef6..722be7300f3 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go @@ -21,6 +21,7 @@ import ( "crypto/sha256" "encoding/binary" "encoding/json" + "errors" "fmt" "math" "math/rand" @@ -28,8 +29,6 @@ import ( "sync" "time" - "github.com/pkg/errors" - apiequality "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -432,7 +431,7 @@ func (cfgCtlr *configController) digestConfigObjects(newPLs []*flowcontrol.Prior // and nothing more needs to be done here. klog.V(5).Infof("%s at %s: attempted update of concurrently deleted FlowSchema %s; nothing more needs to be done", cfgCtlr.name, cfgCtlr.clock.Now().Format(timeFmt), fsu.flowSchema.Name) } else { - errs = append(errs, errors.Wrap(err, fmt.Sprintf("failed to set a status.condition for FlowSchema %s", fsu.flowSchema.Name))) + errs = append(errs, fmt.Errorf("failed to set a status.condition for FlowSchema %s: %w", fsu.flowSchema.Name, err)) } } cfgCtlr.addUpdateResult(currResult) @@ -688,7 +687,7 @@ func queueSetCompleterForPL(qsf fq.QueueSetFactory, queues fq.QueueSet, pl *flow qsc, err = qsf.BeginConstruction(qcQS, intPair) } if err != nil { - err = errors.Wrap(err, fmt.Sprintf("priority level %q has QueuingConfiguration %#+v, which is invalid", pl.Name, qcAPI)) + err = fmt.Errorf("priority level %q has QueuingConfiguration %#+v, which is invalid: %w", pl.Name, qcAPI, err) } return qsc, err } diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go index 7a4c5185489..2528e65e35c 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go @@ -23,8 +23,6 @@ import ( "sync" "time" - "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/util/flowcontrol/counter" @@ -143,7 +141,7 @@ func checkConfig(qCfg fq.QueuingConfig) (*shufflesharding.Dealer, error) { } dealer, err := shufflesharding.NewDealer(qCfg.DesiredNumQueues, qCfg.HandSize) if err != nil { - err = errors.Wrap(err, "the QueueSetConfig implies an invalid shuffle sharding config (DesiredNumQueues is deckSize)") + err = fmt.Errorf("the QueueSetConfig implies an invalid shuffle sharding config (DesiredNumQueues is deckSize): %w", err) } return dealer, err }