github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74403 from ping035627/k8s-190222 

Code cleanup and refactoring
pull/564/head
Kubernetes Prow Robot 2019-02-25 20:28:09 -08:00 committed by GitHub
parent d834885a8c 8fef7221a1
commit 8326ea71a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1070,7 +1070,7 @@ func RunChecks(checks []Checker, ww io.Writer, ignorePreflightErrors sets.String
Name string Name string
Errors []error Errors []error
} }
found := []checkErrors{} var errsBuffer bytes.Buffer
for _, c := range checks { for _, c := range checks {
name := c.Name() name := c.Name()
@ -1085,18 +1085,12 @@ func RunChecks(checks []Checker, ww io.Writer, ignorePreflightErrors sets.String
for _, w := range warnings { for _, w := range warnings {
io.WriteString(ww, fmt.Sprintf("\t[WARNING %s]: %v\n", name, w)) io.WriteString(ww, fmt.Sprintf("\t[WARNING %s]: %v\n", name, w))
} }
if len(errs) > 0 { for _, i := range errs {
found = append(found, checkErrors{Name: name, Errors: errs}) errsBuffer.WriteString(fmt.Sprintf("\t[ERROR %s]: %v\n", name, i.Error()))
} }
} }
if len(found) > 0 { if errsBuffer.Len() > 0 {
var errs bytes.Buffer return &Error{Msg: errsBuffer.String()}
for _, c := range found {
for _, i := range c.Errors {
errs.WriteString(fmt.Sprintf("\t[ERROR %s]: %v\n", c.Name, i.Error()))
}
}
return &Error{Msg: errs.String()}
} }
return nil return nil
} }