diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index d55c7dcf14a8e03cd9df6c0fcfe883f737c96be8..a1bf413a596f5e41c9b3e0cb73774cdb52c4a426 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -83,7 +83,7 @@ func (d *Driver) Create() error { if err := oci.CreateNetwork(d.MachineName, defaultIPRange); err != nil { glog.Warningf("unable to create docker network; node ip may not be stable: %v", err) } else { - params.Network = defaultNetwork + params.Network = defaultIPRange params.IP = "192.168.39.2" } diff --git a/pkg/drivers/kic/oci/network.go b/pkg/drivers/kic/oci/network.go index f9562d7396e317ed36fc74dfc95064848d5f8e8c..603c1d5e07cf3ff4e0ffc6cce6e3a3511411230f 100644 --- a/pkg/drivers/kic/oci/network.go +++ b/pkg/drivers/kic/oci/network.go @@ -171,7 +171,7 @@ func CreateNetwork(name, ipRange string) error { } subnet := fmt.Sprintf("--subnet=%s", ipRange) - _, err = runCmd(exec.Command(Docker, "network", "create", "--driver=bridge", subnet, name)) + _, err := runCmd(exec.Command(Docker, "network", "create", "--driver=bridge", subnet, name)) if err != nil { return errors.Wrapf(err, "error creating network") } @@ -179,9 +179,9 @@ func CreateNetwork(name, ipRange string) error { return nil } -// RemoveNetwork removes a network -func RemoveNetwork(name string) error { - if !networkExists { +// removeNetwork removes a network +func removeNetwork(name string) error { + if !networkExists(name) { return nil } _, err := runCmd(exec.Command(Docker, "network", "remove", name)) @@ -191,7 +191,8 @@ func RemoveNetwork(name string) error { func networkExists(name string) bool { rr, err := runCmd(exec.Command(Docker, "network", "ls", "--format", "{{.Name}}")) if err != nil { - return errors.Wrap(err, "listing networks") + glog.Warningf("error listing networks: %v", err) + return false } networks := strings.Split(rr.Output(), "\n") for _, n := range networks { diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index ccef7aaff0fea1f13d16f918d9f9d68a89dfb13d..e86d07f1a14a39c1a3cd3cd5c2896a5517d726d2 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -86,7 +86,7 @@ func DeleteContainer(ociBin string, name string) error { glog.Infof("couldn't shut down %s (might be okay): %v ", name, err) } - if err := RemoveNetwork(name); err != nil { + if err := removeNetwork(name); err != nil { glog.Warningf("error deleting network: %v", err) }