Fix start cluster when docker container is connected to several networks

pkg/drivers/kic/kic.go

@@ -293,7 +293,12 @@ func (d *Driver) DriverName() string {
 
 // GetIP returns an IP or hostname that this host is available at
 func (d *Driver) GetIP() (string, error) {
-	ip, _, err := oci.ContainerIPs(d.OCIBinary, d.MachineName)
+	networkName := d.NodeConfig.Network
+	if networkName == "" {
+		networkName = d.NodeConfig.ClusterName
+	}
+
+	ip, _, err := oci.ContainerIPs(d.OCIBinary, d.MachineName, networkName)
 	return ip, err
 }
 

pkg/drivers/kic/oci/network.go

@@ -197,25 +197,25 @@ func ForwardedPort(ociBin string, ociID string, contPort int) (int, error) {
 }
 
 // ContainerIPs returns ipv4,ipv6, error of a container by their name
-func ContainerIPs(ociBin string, name string) (string, string, error) {
+func ContainerIPs(ociBin string, containerName string, networkName string) (string, string, error) {
 	if ociBin == Podman {
-		return podmanContainerIP(ociBin, name)
+		return podmanContainerIP(ociBin, containerName, networkName)
 	}
-	return dockerContainerIP(ociBin, name)
+	return dockerContainerIP(ociBin, containerName, networkName)
 }
 
 // podmanContainerIP returns ipv4, ipv6 of container or error
-func podmanContainerIP(ociBin string, name string) (string, string, error) {
+func podmanContainerIP(ociBin string, containerName string, networkName string) (string, string, error) {
 	rr, err := runCmd(exec.Command(ociBin, "container", "inspect",
 		"-f", "{{.NetworkSettings.IPAddress}}",
-		name))
+		containerName))
 	if err != nil {
-		return "", "", errors.Wrapf(err, "podman inspect ip %s", name)
+		return "", "", errors.Wrapf(err, "podman inspect ip %s %s", containerName, networkName)
 	}
 	output := strings.TrimSpace(rr.Stdout.String())
 	if output == "" { // podman returns empty for 127.0.0.1
 		// check network, if the ip address is missing
-		ipv4, ipv6, err := dockerContainerIP(ociBin, name)
+		ipv4, ipv6, err := dockerContainerIP(ociBin, containerName, networkName)
 		if err == nil {
 			return ipv4, ipv6, nil
 		}
@@ -225,9 +225,10 @@ func podmanContainerIP(ociBin string, name string) (string, string, error) {
 }
 
 // dockerContainerIP returns ipv4, ipv6 of container or error
-func dockerContainerIP(ociBin string, name string) (string, string, error) {
+func dockerContainerIP(ociBin string, containerName string, networkName string) (string, string, error) {
 	// retrieve the IP address of the node using docker inspect
-	lines, err := inspect(ociBin, name, "{{range .NetworkSettings.Networks}}{{.IPAddress}},{{.GlobalIPv6Address}}{{end}}")
+	format := fmt.Sprintf("{{with (index .NetworkSettings.Networks %q)}}{{.IPAddress}},{{.GlobalIPv6Address}}{{end}}", networkName)
+	lines, err := inspect(ociBin, containerName, format)
 	if err != nil {
 		return "", "", errors.Wrap(err, "inspecting NetworkSettings.Networks")
 	}

test/integration/helpers_test.go

@@ -44,6 +44,7 @@ import (
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/minikube/pkg/kapi"
+	"k8s.io/minikube/pkg/minikube/constants"
 )
 
 // RunResult stores the result of an cmd.Run call
@@ -687,3 +688,19 @@ func CopyDir(src, dst string) error {
 
 	return nil
 }
+
+// runStatusCmd runs the status command and returns stdout
+func runStatusCmd(ctx context.Context, t *testing.T, profile string, increaseEnv bool) []byte {
+	// make sure minikube status shows insufficient storage
+	c := exec.CommandContext(ctx, Target(), "status", "-p", profile, "--output=json", "--layout=cluster")
+	// artificially set /var to 100% capacity
+	if increaseEnv {
+		c.Env = append(os.Environ(), fmt.Sprintf("%s=100", constants.TestDiskUsedEnv))
+	}
+	rr, err := Run(t, c)
+	// status exits non-0 if status isn't Running
+	if err == nil {
+		t.Fatalf("expected command to fail, but it succeeded: %v\n%v", rr.Command(), err)
+	}
+	return rr.Stdout.Bytes()
+}