github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove usage of github.com/pkg/errors

Browse Source 
Signed-off-by: Niu Lechuan <lechuan.niu@daocloud.io>
This commit is contained in:
Niu Lechuan 2021-06-23 17:46:23 +08:00
parent 7b24c7e4a7
commit 12dcd2f84d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/auth/helpers.go
View File

@ -18,10 +18,10 @@ package auth
import ( import (
"context" "context"
"fmt"
"sync" "sync"
"time" "time"
"github.com/pkg/errors"
authorizationv1 "k8s.io/api/authorization/v1" authorizationv1 "k8s.io/api/authorization/v1"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -99,7 +99,7 @@ func BindClusterRole(c bindingsGetter, clusterRole, ns string, subjects ...rbacv
}, metav1.CreateOptions{}) }, metav1.CreateOptions{})
if err != nil { if err != nil {
return errors.Wrapf(err, "binding clusterrole/%s for %q for %v", clusterRole, ns, subjects) return fmt.Errorf("binding clusterrole/%s for %q for %v: %w", clusterRole, ns, subjects, err)
} }
return nil return nil
@ -136,7 +136,7 @@ func bindInNamespace(c bindingsGetter, roleType, role, ns string, subjects ...rb
}, metav1.CreateOptions{}) }, metav1.CreateOptions{})
if err != nil { if err != nil {
return errors.Wrapf(err, "binding %s/%s into %q for %v", roleType, role, ns, subjects) return fmt.Errorf("binding %s/%s into %q for %v: %w", roleType, role, ns, subjects, err)
} }
return nil return nil

4
test/e2e/framework/provider.go
View File

@ -21,8 +21,6 @@ import (
"os" "os"
"sync" "sync"
"github.com/pkg/errors"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
) )
@ -78,7 +76,7 @@ func SetupProviderConfig(providerName string) (ProviderInterface, error) {
defer mutex.Unlock() defer mutex.Unlock()
factory, ok := providers[providerName] factory, ok := providers[providerName]
if !ok { if !ok {
return nil, errors.Wrapf(os.ErrNotExist, "The provider %s is unknown.", providerName) return nil, fmt.Errorf("The provider %s is unknown: %w", providerName, os.ErrNotExist)
} }
provider, err := factory() provider, err := factory()

4
test/e2e/framework/test_context.go
View File

@ -19,6 +19,7 @@ package framework
import ( import (
"crypto/rand" "crypto/rand"
"encoding/base64" "encoding/base64"
"errors"
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@ -29,7 +30,6 @@ import (
"time" "time"
"github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/config"
"github.com/pkg/errors"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -484,7 +484,7 @@ func AfterReadingAllFlags(t *TestContextType) {
var err error var err error
TestContext.CloudConfig.Provider, err = SetupProviderConfig(TestContext.Provider) TestContext.CloudConfig.Provider, err = SetupProviderConfig(TestContext.Provider)
if err != nil { if err != nil {
if os.IsNotExist(errors.Cause(err)) { if os.IsNotExist(errors.Unwrap(err)) {
// Provide a more helpful error message when the provider is unknown. // Provide a more helpful error message when the provider is unknown.
var providers []string var providers []string
for _, name := range GetProviders() { for _, name := range GetProviders() {