diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 281ca96341..39c07ea3ea 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/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 diff --git a/pkg/drivers/kic/oci/info.go b/pkg/drivers/kic/oci/info.go index b8c7cf33ca..5f9166d677 100644 --- a/pkg/drivers/kic/oci/info.go +++ b/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 } diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index c58e985e5e..3b8c67a849 100644 --- a/pkg/minikube/driver/driver.go +++ b/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 } diff --git a/translations/de.json b/translations/de.json index 5e618d0b07..db4b24e4ae 100644 --- a/translations/de.json +++ b/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}}", diff --git a/translations/es.json b/translations/es.json index 148afc225e..65c64bbb4f 100644 --- a/translations/es.json +++ b/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}}": "", diff --git a/translations/fr.json b/translations/fr.json index 4c4ada9795..99dc4f5075 100644 --- a/translations/fr.json +++ b/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/", diff --git a/translations/ja.json b/translations/ja.json index 2bbdd3e9dc..251e943912 100644 --- a/translations/ja.json +++ b/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/", diff --git a/translations/ko.json b/translations/ko.json index b52b6743a5..22137c1314 100644 --- a/translations/ko.json +++ b/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:": "더 많은 정보를 보려면, 다음을 참고하세요:", diff --git a/translations/pl.json b/translations/pl.json index fe1a61bcfc..48915d7c4c 100644 --- a/translations/pl.json +++ b/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/": "", diff --git a/translations/ru.json b/translations/ru.json index 639ce51fbf..451d8e6e4a 100644 --- a/translations/ru.json +++ b/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/": "", diff --git a/translations/strings.txt b/translations/strings.txt index 0c4f5f3690..727184d431 100644 --- a/translations/strings.txt +++ b/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/": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index bc2f194a94..7dbd407233 100644 --- a/translations/zh-CN.json +++ b/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}}": "",