Merge pull request #15126 from spowelljr/dockerDesktopLinux

use port forwarding on Linux with Docker Desktop

cmd/minikube/cmd/start_flags.go

@@ -611,6 +611,9 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
 			klog.Info("auto-setting LocalStorageCapacityIsolation to false because using btrfs storage driver")
 			cc.KubernetesConfig.FeatureGates = addFeatureGate(cc.KubernetesConfig.FeatureGates, "LocalStorageCapacityIsolation=false")
 		}
+		if runtime.GOOS == "linux" && si.DockerOS == "Docker Desktop" {
+			out.WarningT("For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server")
+		}
 	}
 
 	return cc

pkg/drivers/kic/oci/info.go

@@ -35,6 +35,7 @@ type SysInfo struct {
 	Rootless      bool     // Weather or not the docker is running on rootless mode
 	StorageDriver string   // the storage driver for the daemon  (for example overlay2)
 	Errors        []string // any server issues
+	DockerOS      string   // used to detect if using Docker Desktop or Docker Engine on Linux
 }
 
 var (
@@ -70,7 +71,7 @@ func DaemonInfo(ociBin string) (SysInfo, error) {
 			break
 		}
 	}
-	cachedSysInfo = &SysInfo{CPUs: d.NCPU, TotalMemory: d.MemTotal, OSType: d.OSType, Swarm: d.Swarm.LocalNodeState == "active", Rootless: rootless, StorageDriver: d.Driver, Errors: d.ServerErrors}
+	cachedSysInfo = &SysInfo{CPUs: d.NCPU, TotalMemory: d.MemTotal, OSType: d.OSType, Swarm: d.Swarm.LocalNodeState == "active", Rootless: rootless, StorageDriver: d.Driver, Errors: d.ServerErrors, DockerOS: d.OperatingSystem}
 	return *cachedSysInfo, err
 }
 

pkg/minikube/driver/driver.go

@@ -212,6 +212,9 @@ func NeedsPortForward(name string) bool {
 	if err != nil {
 		panic(err)
 	}
+	if runtime.GOOS == "linux" && si.DockerOS == "Docker Desktop" {
+		return true
+	}
 	return si.Rootless
 }
 

translations/de.json

@@ -297,6 +297,7 @@
 	"Filter to use only VM Drivers": "Filtern um nur VM Treiber zu verwenden",
 	"Flags": "",
 	"Follow": "Fehler beim Folgen der Logs",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Für beste Ergebnisse installieren Sie kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "Für beste Ergebnisse installieren Sie kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For improved {{.driver}} performance, {{.fix}}": "Um die {{.driver}} Performance zu verbessern, {{.fix}}",

translations/es.json

@@ -306,6 +306,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "Para disfrutar de un funcionamiento óptimo, instala kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "Para disfrutar de un funcionamiento óptimo, instala kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For improved {{.driver}} performance, {{.fix}}": "",

translations/fr.json

@@ -291,6 +291,7 @@
 	"Filter to use only VM Drivers": "Filtrer pour n'utiliser que les pilotes VM",
 	"Flags": "Indicateurs",
 	"Follow": "Suivre",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "Pour de meilleures performances {{.driver}}, {{.fix}}",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "Pour plus d'informations, voir : https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}",
 	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "Pour plus d'informations, voir : https://minikube.sigs.k8s.io/docs/reference/drivers/none/",

translations/ja.json

@@ -280,6 +280,7 @@
 	"Filter to use only VM Drivers": "VM ドライバーのみ使用するためのフィルタ",
 	"Flags": "フラグ",
 	"Follow": "フォロー",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "{{.driver}} の性能向上のため、{{.fix}}",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "追加の詳細情報はこちらを参照してください: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}",
 	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "追加の詳細情報はこちらを参照してください: https://minikube.sigs.k8s.io/docs/reference/drivers/none/",

translations/ko.json

@@ -321,6 +321,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "",
 	"For more information, see:": "더 많은 정보를 보려면, 다음을 참고하세요:",

translations/pl.json

@@ -308,6 +308,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "",
 	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",

translations/ru.json

@@ -278,6 +278,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "",
 	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",

translations/strings.txt

@@ -278,6 +278,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
 	"Follow": "",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For improved {{.driver}} performance, {{.fix}}": "",
 	"For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "",
 	"For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",

translations/zh-CN.json

@@ -374,6 +374,7 @@
 	"Filter to use only VM Drivers": "",
 	"Flags": "标志",
 	"Follow": "跟踪",
+	"For an improved experience it's recommended to use Docker Engine instead of Docker Desktop.\nDocker Engine installation instructions: https://docs.docker.com/engine/install/#server": "",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/",
 	"For improved {{.driver}} performance, {{.fix}}": "",