Skip to content

Commit

Permalink
Merge pull request kubernetes#16796 from lbogdan/feat/vmware-new-iso
Browse files Browse the repository at this point in the history
feat: add VMware driver support for new minikube ISO
  • Loading branch information
spowelljr committed Jul 12, 2023
2 parents c3ef0bc + 9502f96 commit de791e7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
11 changes: 0 additions & 11 deletions cmd/minikube/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
}

virtualBoxMacOS13PlusWarning(driverName)
vmwareUnsupported(driverName)
validateFlags(cmd, driverName)
validateUser(driverName)
if driverName == oci.Docker {
Expand Down Expand Up @@ -411,16 +410,6 @@ func virtualBoxMacOS13PlusWarning(driverName string) {
`, out.V{"driver": suggestedDriver})
}

func vmwareUnsupported(driverName string) {
if !driver.IsVMware(driverName) {
return
}
exit.Message(reason.DrvUnsupported, `Due to security improvements to minikube the VMware driver is currently not supported. Available workarounds are to use a different driver or downgrade minikube to v1.29.0.
We are accepting community contributions to fix this, for more details on the issue see: https://github.com/kubernetes/minikube/issues/16221
`)
}

func validateBuiltImageVersion(r command.Runner, driverName string) {
if driver.IsNone(driverName) {
return
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ replace (
github.com/Parallels/docker-machine-parallels/v2 => github.com/minikube-machine/machine-driver-parallels/v2 v2.0.1
github.com/briandowns/spinner => github.com/alonyb/spinner v1.12.7
github.com/docker/machine => github.com/minikube-machine/machine v0.0.0-20230610170757-350a83297593
github.com/machine-drivers/docker-machine-driver-vmware => github.com/minikube-machine/machine-driver-vmware v0.1.5
github.com/machine-drivers/docker-machine-driver-vmware => github.com/lbogdan/docker-machine-driver-vmware v0.2.0
github.com/samalba/dockerclient => github.com/sayboras/dockerclient v1.0.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.4
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lbogdan/docker-machine-driver-vmware v0.2.0 h1:ew0GbsB9/TeQjPO3nWgivOmx7EakXeMbS5kvArvddOM=
github.com/lbogdan/docker-machine-driver-vmware v0.2.0/go.mod h1:HifYFOWR0bAMN4hWtaSADClogvtPy/jV0aRC5alhrKo=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/linode/linodego v1.4.0/go.mod h1:PVsRxSlOiJyvG4/scTszpmZDTdgS+to3X6eS8pRrWI8=
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
Expand Down

0 comments on commit de791e7

Please sign in to comment.