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

remove network correctly

pull/8764/head
Priya Wadhwa 2020-08-12 10:08:46 -07:00
parent 69d21df7c5
commit 2400d1b850
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,6 @@ func DeleteContainersByLabel(ociBin string, label string) []error {
} }
for _, c := range cs { for _, c := range cs {
if err := removeNetwork(c); err != nil {
deleteErrs = append(deleteErrs, errors.Wrap(err, "removing network"))
}
_, err := ContainerStatus(ociBin, c) _, err := ContainerStatus(ociBin, c)
// only try to delete if docker/podman inspect returns // only try to delete if docker/podman inspect returns
// if it doesn't it means docker daemon is stuck and needs restart // if it doesn't it means docker daemon is stuck and needs restart
@ -69,9 +66,8 @@ func DeleteContainersByLabel(ociBin string, label string) []error {
} }
if _, err := runCmd(exec.Command(ociBin, "rm", "-f", "-v", c)); err != nil { if _, err := runCmd(exec.Command(ociBin, "rm", "-f", "-v", c)); err != nil {
deleteErrs = append(deleteErrs, errors.Wrapf(err, "delete container %s: output %s", c, err)) deleteErrs = append(deleteErrs, errors.Wrapf(err, "delete container %s", c))
} }
} }
return deleteErrs return deleteErrs
} }
@ -92,6 +88,9 @@ func DeleteContainer(ociBin string, name string) error {
if _, err := runCmd(exec.Command(ociBin, "rm", "-f", "-v", name)); err != nil { if _, err := runCmd(exec.Command(ociBin, "rm", "-f", "-v", name)); err != nil {
return errors.Wrapf(err, "delete %s", name) return errors.Wrapf(err, "delete %s", name)
} }
if err := removeNetwork(name); err != nil {
return errors.Wrap(err, "removing network")
}
return nil return nil
} }