[WIP] Temporary code changes to make crc use krunkit instead of vfkit on macOS

Author: vyasgun

cmd/crc/cmd/daemon.go

@@ -77,7 +77,7 @@ func createNewVirtualNetworkConfig(providedConfig *crcConfig.Config) types.Confi
 	virtualNetworkConfig := types.Configuration{
 		Debug:             false, // never log packets
 		CaptureFile:       os.Getenv("CRC_DAEMON_PCAP_FILE"),
-		MTU:               4000, // Large packets slightly improve the performance. Less small packets.
+		MTU:               1500,
 		Subnet:            "192.168.127.0/24",
 		GatewayIP:         constants.VSockGateway,
 		GatewayMacAddress: "5a:94:ef:e4:0c:dd",

pkg/crc/cache/cache.go

@@ -59,6 +59,9 @@ func getVersionGeneric(executablePath string, args ...string) (string, error) {
 		logging.Debugf("failed to run executable %s: %v", executablePath, err)
 		return "", err
 	}
+	if executablePath == "/usr/local/bin/krunkit" {
+		return strings.TrimSpace(strings.TrimPrefix(stdOut, "krunkit ")), nil
+	}
 	parsedOutput := strings.Split(stdOut, ":")
 	if len(parsedOutput) < 2 {
 		logging.Debugf("failed to parse version information for %s: %s", executablePath, stdOut)

pkg/crc/cache/cache_darwin.go

@@ -1,8 +1,6 @@
 package cache
 
 import (
-	"strings"
-
 	"github.com/crc-org/crc/v2/pkg/crc/machine/vfkit"
 )
 
@@ -11,9 +9,5 @@ func NewVfkitCache() *Cache {
 }
 
 func getVfkitVersion(executablePath string) (string, error) {
-	version, err := getVersionGeneric(executablePath, "-v")
-	if err != nil {
-		return version, err
-	}
-	return strings.TrimPrefix(version, "v"), nil
+	return getVersionGeneric(executablePath, "-V")
 }

pkg/crc/constants/constants.go

@@ -143,6 +143,9 @@ func GetDefaultBundleSignedHashURL(preset crcpreset.Preset) string {
 }
 
 func ResolveHelperPath(executableName string) string {
+	if executableName == "krunkit" {
+		return "/usr/local/bin/krunkit"
+	}
 	if version.IsInstaller() {
 		return filepath.Join(version.InstallPath(), executableName)
 	}

pkg/crc/machine/vfkit/constants.go

@@ -9,8 +9,8 @@ import (
 )
 
 const (
-	VfkitVersion = "0.6.1"
-	vfkitCommand = "vfkit"
+	VfkitVersion = "1.1.1"
+	vfkitCommand = "krunkit"
 )
 
 var (

pkg/drivers/vfkit/driver_darwin.go

@@ -275,16 +275,16 @@ func (d *Driver) Start() error {
 	// when loading a VM created by a crc version predating this commit,
 	// d.QemuGAVsockPort will be missing from ~/.crc/machines/crc/config.json
 	// In such a case, assume the VM will not support time sync
-	if d.QemuGAVsockPort != 0 {
-		timesync, err := config.TimeSyncNew(d.QemuGAVsockPort)
-		if err != nil {
-			return err
-		}
-		err = vm.AddDevice(timesync)
-		if err != nil {
-			return err
-		}
-	}
+	// if d.QemuGAVsockPort != 0 {
+	// 	timesync, err := config.TimeSyncNew(d.QemuGAVsockPort)
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// 	err = vm.AddDevice(timesync)
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// }
 
 	args, err := vm.ToCmdLine()
 	if err != nil {
@@ -443,15 +443,15 @@ func (d *Driver) findVfkitProcess() (*process.Process, error) {
 		return nil, nil
 	}
 
-	name, err := p.Name()
-	if err != nil {
-		return nil, err
-	}
-	if !strings.HasPrefix(name, "vfkit") {
-		// return InvalidExecutable error?
-		log.Debugf("pid %d is stale, and is being used by %s", pid, name)
-		return nil, nil
-	}
+	// name, err := p.Name()
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// if !strings.HasPrefix(name, "vfkit") {
+	// 	// return InvalidExecutable error?
+	// 	log.Debugf("pid %d is stale, and is being used by %s", pid, name)
+	// 	return nil, nil
+	// }
 
 	return p, nil
 }