github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: remove utilerros pkg in favor of []error

Browse Source
This commit is contained in:
Derek McQuay 2017-03-12 16:34:27 -07:00
parent 7249ba2872
commit 53818b6c84
No known key found for this signature in database
GPG Key ID: 92A7BC0C86B0B91A
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/preflight/BUILD
View File

@ -22,7 +22,6 @@ go_library(
"//test/e2e_node/system:go_default_library", "//test/e2e_node/system:go_default_library",
"//vendor:github.com/PuerkitoBio/purell", "//vendor:github.com/PuerkitoBio/purell",
"//vendor:github.com/blang/semver", "//vendor:github.com/blang/semver",
"//vendor:k8s.io/apimachinery/pkg/util/errors",
], ],
) )

6
cmd/kubeadm/app/preflight/checks.go
View File

@ -38,7 +38,6 @@ import (
"net/url" "net/url"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/api/validation"
@ -343,12 +342,11 @@ func (sysver SystemVerificationCheck) Check() (warnings, errors []error) {
} }
} }
err := utilerrors.NewAggregate(errs) if len(errs) != 0 {
if err != nil {
// Only print the output from the system verification check if the check failed // Only print the output from the system verification check if the check failed
fmt.Println("[preflight] The system verification failed. Printing the output from the verification:") fmt.Println("[preflight] The system verification failed. Printing the output from the verification:")
bufw.Flush() bufw.Flush()
return warns, []error{err} return warns, errs
} }
return warns, nil return warns, nil
} }