kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

return error instead of logging

pull/6695/head
Medya Gh 2020-02-19 20:52:07 -08:00
parent 354ff6256d
commit e1ffa5fb0f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/drivers/kic/oci/oci.go
View File

@ -45,7 +45,7 @@ func DeleteAllContainersByLabel(ociBin string, label string) []error {
} }
cs, err := listContainersByLabel(ociBin, label) cs, err := listContainersByLabel(ociBin, label)
if err != nil { if err != nil {
glog.Infof("error listing containers by label %q: %v", label, err) return []error{fmt.Errorf("listing containers by label %q", label)}
} }
if len(cs) == 0 { if len(cs) == 0 {
return nil return nil
@ -53,7 +53,6 @@ func DeleteAllContainersByLabel(ociBin string, label string) []error {
for _, c := range cs { for _, c := range cs {
cmd := exec.Command(ociBin, "rm", "-f", "-v", c) cmd := exec.Command(ociBin, "rm", "-f", "-v", c)
if out, err := cmd.CombinedOutput(); err != nil { if out, err := cmd.CombinedOutput(); err != nil {
glog.Infof("error deleting container %s: output: %s", c, string(out))
deleteErrs = append(deleteErrs, err) deleteErrs = append(deleteErrs, err)
} }
} }