add socket_vmnet defaults for darwin amd/arm (#143)

* add socket_vmnet defaults for darwin amd/arm

* add acceptance test for socket_vmnet + qemu

Author: scott-the-programmer

minikube/generator/schema_builder.go

@@ -100,6 +100,32 @@ var schemaOverrides map[string]SchemaOverride = map[string]SchemaOverride{
 		Description: "A set of key=value pairs that describe configuration that may be passed to different components. 		The key should be '.' separated, and the first part before the dot is the component to apply the configuration to. 		Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler 		Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, skip-phases, pod-network-cidr",
 		Type:        Array,
 	},
+	"socket_vmnet_path": {
+		Description: "Path to socket vmnet binary (QEMU driver only)",
+		Type:        String,
+		DefaultFunc: `func() (any, error) {
+        var prefix string
+        if runtime.GOARCH == "arm64" {
+            prefix = "/opt/homebrew"
+        } else {
+            prefix = "/usr/local"
+        }
+        return prefix + "/var/run/socket_vmnet", nil
+    }`,
+	},
+	"socket_vmnet_client_path": {
+		Description: "Path to the socket vmnet client binary (QEMU driver only)",
+		Type:        String,
+		DefaultFunc: `func() (any, error) {
+        var prefix string
+        if runtime.GOARCH == "arm64" {
+            prefix = "/opt/homebrew"
+        } else {
+            prefix = "/usr/local"
+        }
+        return prefix + "/opt/socket_vmnet/bin/socket_vmnet_client", nil
+    }`,
+	},
 }
 
 func run(ctx context.Context, args ...string) (string, error) {

minikube/resource_cluster.go

@@ -404,10 +404,12 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (lib.Cluste
 		Nodes: []config.Node{
 			n,
 		},
-		KubernetesConfig:   kubernetesConfig,
-		MultiNodeRequested: multiNode,
-		StaticIP:           d.Get("static_ip").(string),
-		GPUs:               d.Get("gpus").(string),
+		KubernetesConfig:      kubernetesConfig,
+		MultiNodeRequested:    multiNode,
+		StaticIP:              d.Get("static_ip").(string),
+		GPUs:                  d.Get("gpus").(string),
+		SocketVMnetPath:       d.Get("socket_vmnet_path").(string),
+		SocketVMnetClientPath: d.Get("socket_vmnet_client_path").(string),
 	}
 
 	clusterClient.SetConfig(lib.MinikubeClientConfig{

minikube/resource_cluster_test.go

@@ -197,6 +197,26 @@ func TestClusterCreation_Hyperkit(t *testing.T) {
 	})
 }
 
+func TestClusterCreation_QemuSocketVmNet(t *testing.T) {
+	if runtime.GOOS != "darwin" {
+		t.Skip("Hyperkit is only supported on macOS")
+		return
+	}
+
+	resource.Test(t, resource.TestCase{
+		Providers:    map[string]*schema.Provider{"minikube": Provider()},
+		CheckDestroy: verifyDelete,
+		Steps: []resource.TestStep{
+			{
+				Config: testAcceptanceClusterConfigQemuSocketVmNet("qemu2", "TestClusterCreationQemu"),
+				Check: resource.ComposeTestCheckFunc(
+					testPropertyExists("minikube_cluster.new", "TestClusterCreationQemu"),
+				),
+			},
+		},
+	})
+}
+
 func TestClusterCreation_HyperV(t *testing.T) {
 	if runtime.GOOS != "windows" {
 		t.Skip("HyperV is only supported on windows")
@@ -470,6 +490,18 @@ func testAcceptanceClusterConfig(driver string, clusterName string) string {
 	`, driver, clusterName)
 }
 
+func testAcceptanceClusterConfigQemuSocketVmNet(driver string, clusterName string) string {
+	return fmt.Sprintf(`
+	resource "minikube_cluster" "new" {
+		driver = "%s"
+		cluster_name = "%s"
+
+		network = "socket_vmnet"
+
+	}
+	`, driver, clusterName)
+}
+
 func testAcceptanceClusterConfigMultinode(driver string, clusterName string) string {
 	return fmt.Sprintf(`
 	resource "minikube_cluster" "new" {

minikube/schema_cluster.go

@@ -962,7 +962,15 @@ var (
 			Optional:			true,
 			ForceNew:			true,
 
-			Default:	"",
+			DefaultFunc:	func() (any, error) {
+        var prefix string
+        if runtime.GOARCH == "arm64" {
+            prefix = "/opt/homebrew"
+        } else {
+            prefix = "/usr/local"
+        }
+        return prefix + "/opt/socket_vmnet/bin/socket_vmnet_client", nil
+    },
 		},
 
 		"socket_vmnet_path": {
@@ -972,7 +980,15 @@ var (
 			Optional:			true,
 			ForceNew:			true,
 
-			Default:	"",
+			DefaultFunc:	func() (any, error) {
+        var prefix string
+        if runtime.GOARCH == "arm64" {
+            prefix = "/opt/homebrew"
+        } else {
+            prefix = "/usr/local"
+        }
+        return prefix + "/var/run/socket_vmnet", nil
+    },
 		},
 
 		"ssh_ip_address": {