Issue crc-org#838 Remove virtualbox driver support

cfergeau · Dec 10, 2019 · 589fd8c · 589fd8c
1 parent fc30212
commit 589fd8c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 65 deletions.
diff --git a/pkg/crc/machine/client/client_darwin.go b/pkg/crc/machine/client/client_darwin.go
@@ -5,8 +5,6 @@ import (
 	"os"
 
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/machine/drivers/virtualbox"
-	"github.com/code-ready/machine/libmachine/drivers/plugin"
 	"github.com/code-ready/machine/libmachine/drivers/plugin/localbinary"
 )
 
@@ -16,7 +14,7 @@ func StartDriver() {
 		driverName := os.Getenv(localbinary.PluginEnvDriverName)
 		switch driverName {
 		case "virtualbox":
-			plugin.RegisterDriver(virtualbox.NewDriver("", ""))
+			errors.ExitWithMessage(1, "VirtualBox support is no longer available\n")
 		default:
 			errors.ExitWithMessage(1, fmt.Sprintf("Unregistered driver: %s\n", driverName))
 		}

diff --git a/pkg/crc/machine/client/client_windows.go b/pkg/crc/machine/client/client_windows.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/machine/drivers/hyperv"
-	"github.com/code-ready/machine/drivers/virtualbox"
 	"github.com/code-ready/machine/libmachine/drivers/plugin"
 	"github.com/code-ready/machine/libmachine/drivers/plugin/localbinary"
 )
@@ -16,10 +15,10 @@ func StartDriver() {
 	if os.Getenv(localbinary.PluginEnvKey) == localbinary.PluginEnvVal {
 		driverName := os.Getenv(localbinary.PluginEnvDriverName)
 		switch driverName {
-		case "virtualbox":
-			plugin.RegisterDriver(virtualbox.NewDriver("", ""))
 		case "hyperv":
 			plugin.RegisterDriver(hyperv.NewDriver("", ""))
+		case "virtualbox":
+			errors.ExitWithMessage(1, "VirtualBox support is no longer available\n")
 		default:
 			errors.ExitWithMessage(1, fmt.Sprintf("Unregistered driver: %s\n", driverName))
 		}

diff --git a/pkg/crc/machine/driver_darwin.go b/pkg/crc/machine/driver_darwin.go
@@ -3,12 +3,10 @@ package machine
 import (
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	crcos "github.com/code-ready/crc/pkg/os"
 
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/crc/pkg/crc/machine/hyperkit"
-	"github.com/code-ready/crc/pkg/crc/machine/virtualbox"
 )
 
 func init() {
@@ -19,15 +17,8 @@ func init() {
 		DriverPath: constants.CrcBinDir,
 	}
 
-	VirtualBoxMacOSDriver := MachineDriver{
-		Name:     "VirtualBox",
-		Platform: crcos.DARWIN,
-		Driver:   "virtualbox",
-	}
-
 	SupportedDrivers = []MachineDriver{
 		HyperkitDriver,
-		VirtualBoxMacOSDriver,
 	}
 
 	DefaultDriver = HyperkitDriver
@@ -39,12 +30,11 @@ func getDriverOptions(machineConfig config.MachineConfig) interface{} {
 	// Supported drivers
 	switch machineConfig.VMDriver {
 
-	case "virtualbox":
-		logging.Warn("Virtualbox support is deprecated and will be removed in the next release.")
-		driver = virtualbox.CreateHost(machineConfig)
 	case "hyperkit":
 		driver = hyperkit.CreateHost(machineConfig)
 
+	case "virtualbox":
+		errors.ExitWithMessage(1, "VirtualBox support is no longer available\n")
 	default:
 		errors.ExitWithMessage(1, "Unsupported driver: %s", machineConfig.VMDriver)
 	}

diff --git a/pkg/crc/machine/driver_windows.go b/pkg/crc/machine/driver_windows.go
@@ -2,12 +2,10 @@ package machine
 
 import (
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	crcos "github.com/code-ready/crc/pkg/os"
 
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/crc/pkg/crc/machine/hyperv"
-	"github.com/code-ready/crc/pkg/crc/machine/virtualbox"
 )
 
 func init() {
@@ -17,15 +15,8 @@ func init() {
 		Driver:   "hyperv",
 	}
 
-	VirtualBoxWindowsDriver := MachineDriver{
-		Name:     "VirtualBox",
-		Platform: crcos.WINDOWS,
-		Driver:   "virtualbox",
-	}
-
 	SupportedDrivers = []MachineDriver{
 		HyperVDriver,
-		VirtualBoxWindowsDriver,
 	}
 
 	DefaultDriver = HyperVDriver
@@ -37,12 +28,11 @@ func getDriverOptions(machineConfig config.MachineConfig) interface{} {
 	// Supported drivers
 	switch machineConfig.VMDriver {
 
-	case "virtualbox":
-		logging.Warn("Virtualbox support is deprecated and will be removed in the next release.")
-		driver = virtualbox.CreateHost(machineConfig)
 	case "hyperv":
 		driver = hyperv.CreateHost(machineConfig)
 
+	case "virtualbox":
+		errors.ExitWithMessage(1, "VirtualBox support is no longer available\n")
 	default:
 		errors.ExitWithMessage(1, "Unsupported driver: %s", machineConfig.VMDriver)
 	}

diff --git a/pkg/crc/machine/virtualbox/driver.go b/pkg/crc/machine/virtualbox/driver.go
diff --git a/pkg/crc/services/dns/dns_windows.go b/pkg/crc/services/dns/dns_windows.go
@@ -20,12 +20,6 @@ const (
 )
 
 func runPostStartForOS(serviceConfig services.ServicePostStartConfig, result *services.ServicePostStartResult) (services.ServicePostStartResult, error) {
-	// bailout for Virtualbox
-	if serviceConfig.DriverName == "virtualbox" {
-		result.Success = true
-		return *result, nil
-	}
-
 	_, switchName := winnet.SelectSwitchByNameOrDefault(AlternativeNetwork)
 	networkInterface := fmt.Sprintf("vEthernet (%s)", switchName)