Issue #966 Remove driver option from start

CRC only support the native hypervisor for each platform and doesn't
provide any different driver to connect a non-native hypervisor. This
PR will remove unused `driver` option from start command.

Fix #966

Author: praveenkumar

cmd/crc/cmd/config/config.go

@@ -6,13 +6,11 @@ import (
 
 	cfg "github.com/code-ready/crc/pkg/crc/config"
 	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine"
 	"github.com/spf13/cobra"
 )
 
 var (
 	// Start command settings in config
-	VMDriver       = cfg.AddSetting("vm-driver", machine.DefaultDriver.Driver, []cfg.ValidationFnType{cfg.ValidateDriver}, []cfg.SetFn{cfg.SuccessfullyApplied})
 	Bundle         = cfg.AddSetting("bundle", nil, []cfg.ValidationFnType{cfg.ValidateBundle}, []cfg.SetFn{cfg.SuccessfullyApplied})
 	CPUs           = cfg.AddSetting("cpus", constants.DefaultCPUs, []cfg.ValidationFnType{cfg.ValidateCPUs}, []cfg.SetFn{cfg.RequiresRestartMsg})
 	Memory         = cfg.AddSetting("memory", constants.DefaultMemory, []cfg.ValidationFnType{cfg.ValidateMemory}, []cfg.SetFn{cfg.RequiresRestartMsg})

cmd/crc/cmd/start.go

@@ -52,7 +52,6 @@ func runStart(arguments []string) {
 	startConfig := machine.StartConfig{
 		Name:          constants.DefaultName,
 		BundlePath:    crcConfig.GetString(config.Bundle.Name),
-		VMDriver:      crcConfig.GetString(config.VMDriver.Name),
 		Memory:        crcConfig.GetInt(config.Memory.Name),
 		CPUs:          crcConfig.GetInt(config.CPUs.Name),
 		NameServer:    crcConfig.GetString(config.NameServer.Name),
@@ -76,7 +75,6 @@ func runStart(arguments []string) {
 func initStartCmdFlagSet() *pflag.FlagSet {
 	flagSet := pflag.NewFlagSet("start", pflag.ExitOnError)
 	flagSet.StringP(config.Bundle.Name, "b", constants.DefaultBundlePath, "The system bundle used for deployment of the OpenShift cluster")
-	flagSet.StringP(config.VMDriver.Name, "d", machine.DefaultDriver.Driver, fmt.Sprintf("The driver to use for the OpenShift cluster. Possible values: %v", machine.SupportedDriverValues()))
 	flagSet.StringP(config.PullSecretFile.Name, "p", "", fmt.Sprintf("File path of image pull secret (download from %s)", constants.CrcLandingPageURL))
 	flagSet.IntP(config.CPUs.Name, "c", constants.DefaultCPUs, "Number of CPU cores to allocate to the OpenShift cluster")
 	flagSet.IntP(config.Memory.Name, "m", constants.DefaultMemory, "MiB of memory to allocate to the OpenShift cluster")
@@ -91,9 +89,6 @@ func isDebugLog() bool {
 }
 
 func validateStartFlags() error {
-	if err := validation.ValidateDriver(crcConfig.GetString(config.VMDriver.Name)); err != nil {
-		return err
-	}
 	if err := validation.ValidateMemory(crcConfig.GetInt(config.Memory.Name)); err != nil {
 		return err
 	}

pkg/crc/api/handlers.go

@@ -32,7 +32,6 @@ func startHandler(_ ArgsType) string {
 	startConfig := machine.StartConfig{
 		Name:          constants.DefaultName,
 		BundlePath:    crcConfig.GetString(config.Bundle.Name),
-		VMDriver:      crcConfig.GetString(config.VMDriver.Name),
 		Memory:        crcConfig.GetInt(config.Memory.Name),
 		CPUs:          crcConfig.GetInt(config.CPUs.Name),
 		NameServer:    crcConfig.GetString(config.NameServer.Name),

pkg/crc/config/validations.go

@@ -22,14 +22,6 @@ func ValidateBool(value interface{}) (bool, string) {
 	return false, "must be true or false"
 }
 
-// ValidateDriver checks if driver is valid in the config
-func ValidateDriver(value interface{}) (bool, string) {
-	if err := validation.ValidateDriver(value.(string)); err != nil {
-		return false, err.Error()
-	}
-	return true, ""
-}
-
 // ValidateCPUs checks if provided cpus count is valid in the config
 func ValidateCPUs(value interface{}) (bool, string) {
 	v, err := strconv.Atoi(value.(string))

pkg/crc/machine/driver.go

@@ -1,8 +1,6 @@
 package machine
 
 import (
-	"github.com/code-ready/crc/pkg/crc/errors"
-
 	crcos "github.com/code-ready/crc/pkg/os"
 )
 
@@ -25,12 +23,3 @@ func SupportedDriverValues() []string {
 	}
 	return supportedDrivers
 }
-
-func getDriverInfo(driver string) (*MachineDriver, error) {
-	for _, d := range SupportedDrivers {
-		if driver == d.Driver {
-			return &d, nil
-		}
-	}
-	return nil, errors.Newf("No info about unknown driver: %s", driver)
-}

pkg/crc/machine/machine.go

@@ -113,13 +113,13 @@ func Start(startConfig StartConfig) (StartResult, error) {
 	// Pre-VM start
 	var privateKeyPath string
 	var pullSecret string
-	driverInfo, _ := getDriverInfo(startConfig.VMDriver)
+	driverInfo := DefaultDriver
 	exists, err := MachineExists(startConfig.Name)
 	if !exists {
 		machineConfig := config.MachineConfig{
 			Name:       startConfig.Name,
 			BundleName: filepath.Base(startConfig.BundlePath),
-			VMDriver:   startConfig.VMDriver,
+			VMDriver:   driverInfo.Driver,
 			CPUs:       startConfig.CPUs,
 			Memory:     startConfig.Memory,
 		}
@@ -182,12 +182,6 @@ func Start(startConfig StartConfig) (StartResult, error) {
 			logging.Fatalf("Bundle '%s' was requested, but the existing VM is using '%s'",
 				filepath.Base(startConfig.BundlePath), bundleName)
 		}
-		if host.Driver.DriverName() != startConfig.VMDriver {
-			err := errors.Newf("VM driver '%s' was requested, but the existing VM is using '%s' instead",
-				startConfig.VMDriver, host.Driver.DriverName())
-			result.Error = err.Error()
-			return *result, err
-		}
 		vmState, err := host.Driver.GetState()
 		if err != nil {
 			result.Error = err.Error()

pkg/crc/machine/types.go

@@ -14,9 +14,8 @@ type StartConfig struct {
 	BundlePath string
 
 	// Hypervisor
-	VMDriver string
-	Memory   int
-	CPUs     int
+	Memory int
+	CPUs   int
 
 	// Nameserver
 	NameServer string

pkg/crc/validation/validation.go

@@ -11,19 +11,8 @@ import (
 
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/machine"
 )
 
-// Validate the given driver is supported or not
-func ValidateDriver(driver string) error {
-	for _, d := range machine.SupportedDriverValues() {
-		if driver == d {
-			return nil
-		}
-	}
-	return errors.Newf("Unsupported driver: %s, use '--vm-driver' option to provide a supported driver %s\n", driver, machine.SupportedDriverValues())
-}
-
 // ValidateCPUs checks if provided cpus count is valid
 func ValidateCPUs(value int) error {
 	if value < constants.DefaultCPUs {