diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index 9c2e666f84..12a2e9492b 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -88,7 +88,11 @@ var serviceCmd = &cobra.Command{ co := mustload.Healthy(cname) if driver.IsQEMU(co.Config.Driver) && pkgnetwork.IsUser(co.Config.Network) { - exit.Message(reason.Unimplemented, "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'") + msg := "minikube service is not currently implemented with the user network on QEMU" + if runtime.GOOS == "darwin" { + msg += ", try starting minikube with '--network=socket_vmnet'" + } + exit.Message(reason.Unimplemented, msg) } var services service.URLs diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 072c9d00d9..281ca96341 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -18,6 +18,7 @@ package cmd import ( "fmt" + "runtime" "strings" "time" @@ -463,10 +464,12 @@ func getNetwork(driverName string) string { return n } if n == "" { - out.WarningT("The default network for QEMU will change from 'user' to 'socket_vmnet' in a future release") + if runtime.GOOS == "darwin" { + out.WarningT("The default network for QEMU will change from 'user' to 'socket_vmnet' in a future release") + } n = "user" } - if n == "user" { + if n == "user" && runtime.GOOS == "darwin" { out.WarningT("You are using the QEMU driver without a dedicated network, which doesn't support `minikube service` & `minikube tunnel` commands.\nTo try the experimental dedicated network see: https://minikube.sigs.k8s.io/docs/drivers/qemu/#networking") } return n diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go index 6a8a8e827b..50ea8c80d0 100644 --- a/cmd/minikube/cmd/tunnel.go +++ b/cmd/minikube/cmd/tunnel.go @@ -21,6 +21,7 @@ import ( "os" "os/signal" "path/filepath" + "runtime" "strconv" "github.com/spf13/cobra" @@ -58,7 +59,11 @@ var tunnelCmd = &cobra.Command{ co := mustload.Healthy(cname) if driver.IsQEMU(co.Config.Driver) && pkgnetwork.IsUser(co.Config.Network) { - exit.Message(reason.Unimplemented, "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'") + msg := "minikube tunnel is not currently implemented with the user network on QEMU" + if runtime.GOOS == "darwin" { + msg += ", try starting minikube with '--network=socket_vmnet'" + } + exit.Message(reason.Unimplemented, msg) } if cleanup { diff --git a/translations/de.json b/translations/de.json index e542698d05..54a30bd96c 100644 --- a/translations/de.json +++ b/translations/de.json @@ -975,10 +975,10 @@ "minikube profile was successfully set to {{.profile_name}}": "Minikube Profil wurde erfolgreich gesetzt auf {{.profile_name}}", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "Minikube provisioniert und managed lokale Kubernetes Cluster optimiert für Entwicklungs-Workflows.", "minikube quickly sets up a local Kubernetes cluster": "Minikube installiert schnell einen lokalen Kubernetes Cluster", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "Minikube überspringt diverse Validierungen wenn --force angegeben ist; das könnte zu unerwartetem Verhalten führen", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "Minikube {{.version}} ist verfügbar. Lade es herunter: {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "mkcmp wird verwendet um die Performance von zwei Minikube Binaries zu vergleichen", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "Das Argument \"{{.value}}\" für Mount muss in der Form \u003cQuell Verzeichnis\u003e:\u003cZiel Verzeichnis\u003e", diff --git a/translations/es.json b/translations/es.json index 55184ac2a3..73ea9f8338 100644 --- a/translations/es.json +++ b/translations/es.json @@ -970,10 +970,10 @@ "minikube profile was successfully set to {{.profile_name}}": "", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "", "minikube quickly sets up a local Kubernetes cluster": "", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "", "mkcmp is used to compare performance of two minikube binaries": "", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "", diff --git a/translations/fr.json b/translations/fr.json index 07338b1454..38488d1bc4 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -821,8 +821,8 @@ "Using image repository {{.name}}": "Utilisation du dépôt d'images {{.name}}…", "Using image {{.registry}}{{.image}}": "Utilisation de l'image {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "Utilisation de l'image {{.registry}}{{.image}} (référentiel d'images global)", - "Using qemu with --network=socket for 'socket_vmnet' is experimental": "L'utilisation de qemu avec --network=socket pour 'socket_vmnet' est expérimentale", "Using qemu with 'socket_vmnet' network is experimental": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "L'utilisation de qemu avec --network=socket pour 'socket_vmnet' est expérimentale", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "L'utilisation du pilote Docker sans root était nécessaire, mais le Docker actuel ne semble pas sans root. Essayez 'docker context use rootless' .", "Using rootless driver was required, but the current driver does not seem rootless": "L'utilisation d'un pilote sans root était nécessaire, mais le pilote actuel ne semble pas sans root", "Using rootless {{.driver_name}} driver": "Utilisation du pilote {{.driver_name}} sans root", @@ -947,11 +947,11 @@ "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube provisionne et gère des clusters Kubernetes locaux optimisés pour les workflows de développement.", "minikube quickly sets up a local Kubernetes cluster": "minikube configure rapidement un cluster Kubernetes local", "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "Le service minikube n'est actuellement pas implémenté avec le pilote qemu2. Voir https://github.com/kubernetes/minikube/issues/14146 pour plus de détails.", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "minikube ignore diverses validations lorsque --force est fourni ; cela peut conduire à un comportement inattendu", "minikube status --output OUTPUT. json, text": "état minikube --sortie SORTIE. json, texte", "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "Le tunnel minikube n'est actuellement pas implémenté avec le pilote qemu2. Voir https://github.com/kubernetes/minikube/issues/14146 pour plus de détails.", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} est disponible ! Téléchargez-le ici : {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "mkcmp est utilisé pour comparer les performances de deux binaires minikube", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "argument de montage \"{{.value}}\" doit être de la forme : \u003cdossier source\u003e:\u003cdossier de destination\u003e", @@ -1034,4 +1034,4 @@ "{{.profile}} profile is not valid: {{.err}}": "Le profil {{.profile}} n'est pas valide : {{.err}}", "{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} n'est pas encore un système de fichiers pris en charge. Nous essaierons quand même !", "{{.url}} is not accessible: {{.error}}": "{{.url}} n'est pas accessible : {{.error}}" -} +} \ No newline at end of file diff --git a/translations/ja.json b/translations/ja.json index be7bf32292..bb127a46c1 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -907,11 +907,11 @@ "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube は、開発ワークフロー用に最適化されたローカル Kubernetes クラスターを構築・管理します。", "minikube quickly sets up a local Kubernetes cluster": "minikube はローカル Kubernetes クラスターを迅速にセットアップします", "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "minikube サービスは現在、qemu2 ドライバーでは実装されていません。詳細については、https://github.com/kubernetes/minikube/issues/14146 を参照してください。", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "minikube は --force が付与された場合、様々な検証をスキップします (これは予期せぬ挙動を引き起こすかも知れません)", "minikube status --output OUTPUT. json, text": "minikube status --output OUTPUT. json, text", "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "minikube トンネルは現在、qemu2 ドライバーでは実装されていません。 詳細については、https://github.com/kubernetes/minikube/issues/14146 を参照してください。", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} が利用可能です！次の URL からダウンロードしてください: {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "mkcmp で 2 つの minikube のバイナリーのパフォーマンスを比較できます", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "マウント引数「{{.value}}」は次の形式でなければなりません: \u003cソースディレクトリー\u003e:\u003cターゲットディレクトリー\u003e", @@ -989,4 +989,4 @@ "{{.profile}} profile is not valid: {{.err}}": "{{.profile}} プロファイルは無効です: {{.err}}", "{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} は未サポートのファイルシステムです。とにかくやってみます！", "{{.url}} is not accessible: {{.error}}": "{{.url}} にアクセスできません: {{.error}}" -} +} \ No newline at end of file diff --git a/translations/ko.json b/translations/ko.json index 90432bd021..e8bc5951be 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -978,10 +978,10 @@ "minikube profile was successfully set to {{.profile_name}}": "", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube는 개발 워크플로우에 최적화된 로컬 쿠버네티스를 제공하고 관리합니다.", "minikube quickly sets up a local Kubernetes cluster": "", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} 이 사용가능합니다! 다음 경로에서 다운받으세요: {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "", diff --git a/translations/pl.json b/translations/pl.json index 6d35c190ea..1d0a99f632 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -983,10 +983,10 @@ "minikube profile was successfully set to {{.profile_name}}": "profil minikube został z powodzeniem zmieniony na: {{.profile_name}}", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube dostarcza lokalne klastry Kubernetesa zoptymalizowane do celów rozwoju oprogramowania oraz zarządza nimi", "minikube quickly sets up a local Kubernetes cluster": "minikube szybko inicjalizuje lokalny klaster Kubernetesa", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "użycie flagi --force sprawia, że minikube pomija pewne walidacje, co może skutkować niespodziewanym zachowaniem", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} jest dostępne! Pobierz je z: {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "", diff --git a/translations/ru.json b/translations/ru.json index fac92fdd04..c93eb21a41 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -902,10 +902,10 @@ "minikube profile was successfully set to {{.profile_name}}": "", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "", "minikube quickly sets up a local Kubernetes cluster": "", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "", "mkcmp is used to compare performance of two minikube binaries": "", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "", diff --git a/translations/strings.txt b/translations/strings.txt index d230be849e..5cf8d39da3 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -902,10 +902,10 @@ "minikube profile was successfully set to {{.profile_name}}": "", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "", "minikube quickly sets up a local Kubernetes cluster": "", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "", "mkcmp is used to compare performance of two minikube binaries": "", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 022d29bc9f..0afd6f3123 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1093,10 +1093,10 @@ "minikube profile was successfully set to {{.profile_name}}": "", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "", "minikube quickly sets up a local Kubernetes cluster": "", - "minikube service is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube service is not currently implemented with the user network on QEMU": "", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "", "minikube status --output OUTPUT. json, text": "", - "minikube tunnel is not currently implemented with the user network on QEMU, try starting minikube with '--network=socket_vmnet'": "", + "minikube tunnel is not currently implemented with the user network on QEMU": "", "minikube {{.version}} is available! Download it: {{.url}}": "", "mkcmp is used to compare performance of two minikube binaries": "mkcmp 用于对比两个 minikube 二进制的性能", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",