Skip to content

vmnet: Move download-only check to start command #21682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+14 −8
Closed

vmnet: Move download-only check to start command #21682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cmd/minikube/cmd/start_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,8 @@ func getNetwork(driverName string) string {
return validateQemuNetwork(n)
} else if driver.IsVFKit(driverName) {
return validateVfkitNetwork(n)
} else if driver.IsKrunkit(driverName) {
return validateVmnetNetwork(n)
}
return n
}
Expand Down Expand Up @@ -535,10 +537,7 @@ func validateVfkitNetwork(n string) string {
// always available
case "vmnet-shared":
// "vment-shared" provides access between machines, with lower performance compared to "nat".
if err := vmnet.ValidateHelper(); err != nil {
vmnetErr := err.(*vmnet.Error)
exit.Message(vmnetErr.Kind, "failed to validate {{.network}} network: {{.reason}}", out.V{"network": n, "reason": err})
}
n = validateVmnetNetwork(n)
case "":
// Default to nat since it is always available and provides the best performance.
n = "nat"
Expand All @@ -548,6 +547,17 @@ func validateVfkitNetwork(n string) string {
return n
}

func validateVmnetNetwork(n string) string {
if !viper.GetBool(downloadOnly) {
if err := vmnet.ValidateHelper(); err != nil {
vmnetErr := err.(*vmnet.Error)
exit.Message(vmnetErr.Kind, "failed to validate {{.network}} network: {{.reason}}",
out.V{"network": n, "reason": err})
}
}
return n
}

// generateNewConfigFromFlags generate a config.ClusterConfig based on flags
func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime string, drvName string) config.ClusterConfig {
var cc config.ClusterConfig
Expand Down
4 changes: 0 additions & 4 deletions pkg/minikube/registry/drvs/krunkit/krunkit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,5 @@ func status() registry.State {
if _, err := exec.LookPath("krunkit"); err != nil {
return registry.State{Error: err, Fix: "Run 'brew tap slp/krunkit && brew install krunkit'", Doc: docURL}
}
if err := vmnet.ValidateHelper(); err != nil {
vmnetErr := err.(*vmnet.Error)
return registry.State{Error: vmnetErr.Err, Fix: "Install and configure vment-helper", Doc: docURL}
}
return registry.State{Installed: true, Healthy: true, Running: true}
}
Loading