mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
kubeadm: remove utilerros pkg in favor of []error
This commit is contained in:
parent
7249ba2872
commit
53818b6c84
@ -22,7 +22,6 @@ go_library(
|
||||
"//test/e2e_node/system:go_default_library",
|
||||
"//vendor:github.com/PuerkitoBio/purell",
|
||||
"//vendor:github.com/blang/semver",
|
||||
"//vendor:k8s.io/apimachinery/pkg/util/errors",
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -38,7 +38,6 @@ import (
|
||||
|
||||
"net/url"
|
||||
|
||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
||||
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
||||
"k8s.io/kubernetes/pkg/api/validation"
|
||||
@ -343,12 +342,11 @@ func (sysver SystemVerificationCheck) Check() (warnings, errors []error) {
|
||||
}
|
||||
}
|
||||
|
||||
err := utilerrors.NewAggregate(errs)
|
||||
if err != nil {
|
||||
if len(errs) != 0 {
|
||||
// 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:")
|
||||
bufw.Flush()
|
||||
return warns, []error{err}
|
||||
return warns, errs
|
||||
}
|
||||
return warns, nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user