github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103083 from vivian-xu/use-native-errors

Browse Source 
Update github.com/pkg/errors with go native errors pkg
This commit is contained in:
Kubernetes Prow Robot 2021-07-02 13:38:38 -07:00 committed by GitHub
commit d1833880a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/windows/gmsa_full.go
View File

@ -58,7 +58,6 @@ import (
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega" "github.com/onsi/gomega"
"github.com/pkg/errors"
) )
const ( const (
@ -248,7 +247,7 @@ func deployGmsaWebhook(f *framework.Framework, deployScriptPath string) (func(),
tempDir, err := ioutil.TempDir("", "") tempDir, err := ioutil.TempDir("", "")
if err != nil { if err != nil {
return cleanUpFunc, errors.Wrapf(err, "unable to create temp dir") return cleanUpFunc, fmt.Errorf("unable to create temp dir: %w", err)
} }
manifestsFile := path.Join(tempDir, "manifests.yml") manifestsFile := path.Join(tempDir, "manifests.yml")
@ -275,7 +274,7 @@ func deployGmsaWebhook(f *framework.Framework, deployScriptPath string) (func(),
if err == nil { if err == nil {
framework.Logf("GMSA webhook successfully deployed, output:\n%s", string(output)) framework.Logf("GMSA webhook successfully deployed, output:\n%s", string(output))
} else { } else {
err = errors.Wrapf(err, "unable to deploy GMSA webhook, output:\n%s", string(output)) err = fmt.Errorf("unable to deploy GMSA webhook, output:\n%s: %w", string(output), err)
} }
return cleanUpFunc, err return cleanUpFunc, err
@ -290,7 +289,7 @@ func createGmsaCustomResource(ns string, crdManifestContents string) (func(), er
tempFile, err := ioutil.TempFile("", "") tempFile, err := ioutil.TempFile("", "")
if err != nil { if err != nil {
return cleanUpFunc, errors.Wrapf(err, "unable to create temp file") return cleanUpFunc, fmt.Errorf("unable to create temp file: %w", err)
} }
defer tempFile.Close() defer tempFile.Close()
@ -301,13 +300,13 @@ func createGmsaCustomResource(ns string, crdManifestContents string) (func(), er
_, err = tempFile.WriteString(crdManifestContents) _, err = tempFile.WriteString(crdManifestContents)
if err != nil { if err != nil {
err = errors.Wrapf(err, "unable to write GMSA contents to %q", tempFile.Name()) err = fmt.Errorf("unable to write GMSA contents to %q: %w", tempFile.Name(), err)
return cleanUpFunc, err return cleanUpFunc, err
} }
output, err := framework.RunKubectl(ns, "apply", "--filename", tempFile.Name()) output, err := framework.RunKubectl(ns, "apply", "--filename", tempFile.Name())
if err != nil { if err != nil {
err = errors.Wrapf(err, "unable to create custom resource, output:\n%s", output) err = fmt.Errorf("unable to create custom resource, output:\n%s: %w", output, err)
} }
return cleanUpFunc, err return cleanUpFunc, err
@ -339,7 +338,7 @@ func createRBACRoleForGmsa(f *framework.Framework) (string, func(), error) {
_, err := f.ClientSet.RbacV1().ClusterRoles().Create(context.TODO(), role, metav1.CreateOptions{}) _, err := f.ClientSet.RbacV1().ClusterRoles().Create(context.TODO(), role, metav1.CreateOptions{})
if err != nil { if err != nil {
err = errors.Wrapf(err, "unable to create RBAC cluster role %q", roleName) err = fmt.Errorf("unable to create RBAC cluster role %q: %w", roleName, err)
} }
return roleName, cleanUpFunc, err return roleName, cleanUpFunc, err

7
test/e2e/windows/utils.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package windows package windows
import ( import (
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/pkg/errors"
) )
// downloadFile saves a remote URL to a local temp file, and returns its path. // downloadFile saves a remote URL to a local temp file, and returns its path.
@ -29,13 +28,13 @@ import (
func downloadFile(url string) (string, error) { func downloadFile(url string) (string, error) {
response, err := http.Get(url) response, err := http.Get(url)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "unable to download from %q", url) return "", fmt.Errorf("unable to download from %q: %w", url, err)
} }
defer response.Body.Close() defer response.Body.Close()
tempFile, err := ioutil.TempFile("", "") tempFile, err := ioutil.TempFile("", "")
if err != nil { if err != nil {
return "", errors.Wrapf(err, "unable to create temp file") return "", fmt.Errorf("unable to create temp file: %w", err)
} }
defer tempFile.Close() defer tempFile.Close()