diff --git a/test/e2e/framework/auth/helpers.go b/test/e2e/framework/auth/helpers.go index 4b984263eb8..29f3f65b651 100644 --- a/test/e2e/framework/auth/helpers.go +++ b/test/e2e/framework/auth/helpers.go @@ -18,10 +18,10 @@ package auth import ( "context" + "fmt" "sync" "time" - "github.com/pkg/errors" authorizationv1 "k8s.io/api/authorization/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -99,7 +99,7 @@ func BindClusterRole(c bindingsGetter, clusterRole, ns string, subjects ...rbacv }, metav1.CreateOptions{}) 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 @@ -136,7 +136,7 @@ func bindInNamespace(c bindingsGetter, roleType, role, ns string, subjects ...rb }, metav1.CreateOptions{}) 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 diff --git a/test/e2e/framework/provider.go b/test/e2e/framework/provider.go index 74411557a40..986cec98181 100644 --- a/test/e2e/framework/provider.go +++ b/test/e2e/framework/provider.go @@ -21,8 +21,6 @@ import ( "os" "sync" - "github.com/pkg/errors" - "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" ) @@ -78,7 +76,7 @@ func SetupProviderConfig(providerName string) (ProviderInterface, error) { defer mutex.Unlock() factory, ok := providers[providerName] 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() diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index 344601cb539..4cab88db40b 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -19,6 +19,7 @@ package framework import ( "crypto/rand" "encoding/base64" + "errors" "flag" "fmt" "io/ioutil" @@ -29,7 +30,6 @@ import ( "time" "github.com/onsi/ginkgo/config" - "github.com/pkg/errors" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" @@ -484,7 +484,7 @@ func AfterReadingAllFlags(t *TestContextType) { var err error TestContext.CloudConfig.Provider, err = SetupProviderConfig(TestContext.Provider) 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. var providers []string for _, name := range GetProviders() {