Merge pull request #1125 from gy95/errors
replace github.com/pkg/errors with golang native errors
This commit is contained in:
commit
4a751dadfb
1
go.mod
1
go.mod
|
@ -11,7 +11,6 @@ require (
|
|||
github.com/lithammer/dedent v1.1.0
|
||||
github.com/onsi/ginkgo v1.16.4
|
||||
github.com/onsi/gomega v1.16.0
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/prometheus/client_golang v1.11.0
|
||||
github.com/spf13/cobra v1.2.1
|
||||
github.com/spf13/pflag v1.0.5
|
||||
|
|
|
@ -2,8 +2,7 @@ package kubernetes
|
|||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"fmt"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
@ -33,7 +32,7 @@ func (i *InstallOptions) CreateNamespace() error {
|
|||
|
||||
_, err = namespaceClient.Create(context.TODO(), n, metav1.CreateOptions{})
|
||||
if err != nil {
|
||||
return errors.Errorf("Create namespace %s failed: %v\n", i.Namespace, err)
|
||||
return fmt.Errorf("Create namespace %s failed: %v", i.Namespace, err)
|
||||
}
|
||||
klog.Infof("Create Namespace '%s' successfully.", i.Namespace)
|
||||
return nil
|
||||
|
|
|
@ -2,8 +2,7 @@ package kubernetes
|
|||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"fmt"
|
||||
|
||||
rbacv1 "k8s.io/api/rbac/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
@ -81,7 +80,7 @@ func (i *InstallOptions) CreateClusterRole() error {
|
|||
|
||||
_, err = clusterRoleClient.Create(context.TODO(), clusterRole, metav1.CreateOptions{})
|
||||
if err != nil {
|
||||
return errors.Errorf("Create ClusterRole %s failed: %v\n", clusterRole.Name, err)
|
||||
return fmt.Errorf("create ClusterRole %s failed: %v", clusterRole.Name, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -2,8 +2,7 @@ package kubernetes
|
|||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"fmt"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
@ -64,7 +63,7 @@ func (i *InstallOptions) CreateSecret(secret *corev1.Secret) error {
|
|||
FieldManager: "apply",
|
||||
})
|
||||
if err != nil {
|
||||
return errors.Errorf("Apply secret %s failed: %v\n", secret.Name, err)
|
||||
return fmt.Errorf("apply secret %s failed: %v", secret.Name, err)
|
||||
}
|
||||
klog.Infof("secret %s update successfully.", secret.Name)
|
||||
return nil
|
||||
|
@ -73,7 +72,7 @@ func (i *InstallOptions) CreateSecret(secret *corev1.Secret) error {
|
|||
|
||||
_, err = secretClient.Create(context.TODO(), secret, metav1.CreateOptions{})
|
||||
if err != nil {
|
||||
return errors.Errorf("Create secret %s failed: %v\n", secret.Name, err)
|
||||
return fmt.Errorf("create secret %s failed: %v", secret.Name, err)
|
||||
}
|
||||
klog.Infof("secret %s Create successfully.", secret.Name)
|
||||
return nil
|
||||
|
|
|
@ -2,8 +2,7 @@ package kubernetes
|
|||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"fmt"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
@ -52,7 +51,7 @@ func (i *InstallOptions) CreateService(service *corev1.Service) error {
|
|||
FieldManager: "apply",
|
||||
})
|
||||
if err != nil {
|
||||
return errors.Errorf("Apply service %s failed: %v\n", service.Name, err)
|
||||
return fmt.Errorf("apply service %s failed: %v", service.Name, err)
|
||||
}
|
||||
klog.Infof("service %s update successfully.", service.Name)
|
||||
return nil
|
||||
|
@ -61,7 +60,7 @@ func (i *InstallOptions) CreateService(service *corev1.Service) error {
|
|||
|
||||
_, err = serviceClient.Create(context.TODO(), service, metav1.CreateOptions{})
|
||||
if err != nil {
|
||||
return errors.Errorf("Create service %s failed: %v\n", service.Name, err)
|
||||
return fmt.Errorf("create service %s failed: %v", service.Name, err)
|
||||
}
|
||||
klog.Infof("service %s create successfully.", service.Name)
|
||||
return nil
|
||||
|
|
|
@ -230,7 +230,6 @@ github.com/pelletier/go-toml
|
|||
# github.com/peterbourgon/diskv v2.0.1+incompatible
|
||||
github.com/peterbourgon/diskv
|
||||
# github.com/pkg/errors v0.9.1
|
||||
## explicit
|
||||
github.com/pkg/errors
|
||||
# github.com/pmezard/go-difflib v1.0.0
|
||||
github.com/pmezard/go-difflib/difflib
|
||||
|
|
Loading…
Reference in New Issue