Support non-default docker endpoints

pkg/drivers/kic/kic.go

@@ -19,7 +19,6 @@ package kic
 import (
 	"fmt"
 	"net"
-	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -95,10 +94,13 @@ func (d *Driver) Create() error {
 		klog.Infof("calculated static IP %q for the %q container", ip.String(), d.NodeConfig.MachineName)
 		params.IP = ip.String()
 	}
+	drv := d.DriverName()
 	listAddr := oci.DefaultBindIPV4
-	if d.DriverName() == oci.Docker && os.Getenv(constants.DockerHostEnv) != "" {
+	if oci.IsExternalRuntimeHost(drv) {
+		klog.Infof("Listening 0.0.0.0 on external docker host %v", oci.RuntimeHost(drv))
 		listAddr = "0.0.0.0"
 	}
+
 	// control plane specific options
 	params.PortMappings = append(params.PortMappings,
 		oci.PortMapping{
@@ -230,12 +232,12 @@ func (d *Driver) GetIP() (string, error) {
 
 // GetExternalIP returns an IP which is accessible from outside
 func (d *Driver) GetExternalIP() (string, error) {
-	return oci.DockerHost(d.DriverName()), nil
+	return oci.RuntimeHost(d.DriverName()), nil
 }
 
 // GetSSHHostname returns hostname for use with ssh
 func (d *Driver) GetSSHHostname() (string, error) {
-	return oci.DockerHost(d.DriverName()), nil
+	return oci.RuntimeHost(d.DriverName()), nil
 }
 
 // GetSSHPort returns port for use with ssh

pkg/drivers/kic/oci/oci.go

@@ -640,28 +640,35 @@ func iptablesFileExists(ociBin string, nameOrID string) bool {
 	return true
 }
 
-// TODO: comment
-func DockerHost(driver string) string {
+// RuntimeHost returns the ip/hostname where OCI daemon service for driver is running
+// For Podman it's always DefaultBindIPV4
+// For Docker return the host part of DOCKER_HOST environment variable if set
+// or DefaultBindIPV4 otherwise
+func RuntimeHost(driver string) string {
 	if driver != Docker {
 		return DefaultBindIPV4
 	}
-	if v := DockerMachineHost(driver); v != "" {
-		return v
+	if dh := os.Getenv(constants.DockerHostEnv); dh != "" {
+		if u, err := url.Parse(dh); err == nil {
+			if u.Host != "" {
+				return u.Hostname()
+			}
+		}
 	}
 	return DefaultBindIPV4
 }
 
-// TODO: comment
-func DockerMachineHost(driver string) string {
+// IsExternalRuntimeHost returns whether or not the OCI runtime is running on an external/virtual host
+// For Podman driver it's always false for now
+// For Docker driver return true if DOCKER_HOST is set to a URI, and the URI contains a host item
+func IsExternalRuntimeHost(driver string) bool {
 	if driver != Docker {
-		return ""
+		return false
 	}
 	if dh := os.Getenv(constants.DockerHostEnv); dh != "" {
 		if u, err := url.Parse(dh); err == nil {
-			if u.Host != "" {
-				return u.Hostname()
-			}
+			return u.Host != ""
 		}
 	}
-	return ""
+	return false
 }

pkg/minikube/bootstrapper/certs.go

@@ -196,7 +196,7 @@ func generateProfileCerts(k8s config.KubernetesConfig, n config.Node, ccs CACert
 
 	apiServerIPs := append(
 		k8s.APIServerIPs,
-		[]net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(oci.DockerHost(k8s.ContainerRuntime)), net.ParseIP("10.0.0.1")}...)
+		[]net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(oci.RuntimeHost(k8s.ContainerRuntime)), net.ParseIP("10.0.0.1")}...)
 	apiServerNames := append(k8s.APIServerNames, k8s.APIServerName, constants.ControlPlaneAlias)
 	apiServerAlternateNames := append(
 		apiServerNames,

pkg/minikube/driver/driver.go

@@ -151,11 +151,11 @@ func NeedsPortForward(name string) bool {
 	if !IsKIC(name) {
 		return false
 	}
-	if oci.DockerMachineHost(name) != "" {
+	if oci.IsExternalRuntimeHost(name) {
 		return true
 	}
 	// Docker for Desktop
-	return (runtime.GOOS == "darwin" || runtime.GOOS == "windows" || IsMicrosoftWSL())
+	return runtime.GOOS == "darwin" || runtime.GOOS == "windows" || IsMicrosoftWSL()
 }
 
 // IsMicrosoftWSL will return true if process is running in WSL in windows

pkg/minikube/driver/endpoint.go

@@ -29,7 +29,7 @@ import (
 func ControlPlaneEndpoint(cc *config.ClusterConfig, cp *config.Node, driverName string) (string, net.IP, int, error) {
 	if NeedsPortForward(driverName) {
 		port, err := oci.ForwardedPort(cc.Driver, cc.Name, cp.Port)
-		hostname := oci.DockerHost(driverName)
+		hostname := oci.RuntimeHost(driverName)
 
 		ip := net.ParseIP(hostname)
 		if ip == nil {