From 0b7c0810c98af6a6610591a3dee68d9990198576 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 9 Feb 2023 10:27:16 -0800
Subject: [PATCH] add support to new builtin value on existing cluster

---
 pkg/drivers/qemu/qemu.go   | 11 ++++++-----
 pkg/minikube/cluster/ip.go |  4 +---
 pkg/network/network.go     |  5 ++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go
index e7bc6803c9..e9b4c1b1d7 100644
--- a/pkg/drivers/qemu/qemu.go
+++ b/pkg/drivers/qemu/qemu.go
@@ -40,6 +40,7 @@ import (
 	"github.com/pkg/errors"
 
 	pkgdrivers "k8s.io/minikube/pkg/drivers"
+	"k8s.io/minikube/pkg/network"
 )
 
 const (
@@ -88,7 +89,7 @@ func (d *Driver) GetMachineName() string {
 }
 
 func (d *Driver) GetSSHHostname() (string, error) {
-	if d.Network == "builtin" {
+	if network.IsBuiltin(d.Network) {
 		return "localhost", nil
 	}
 	return d.IPAddress, nil
@@ -145,7 +146,7 @@ func NewDriver(hostName, storePath string) drivers.Driver {
 }
 
 func (d *Driver) GetIP() (string, error) {
-	if d.Network == "builtin" {
+	if network.IsBuiltin(d.Network) {
 		return "127.0.0.1", nil
 	}
 	return d.IPAddress, nil
@@ -213,7 +214,7 @@ func (d *Driver) PreCreateCheck() error {
 func (d *Driver) Create() error {
 	var err error
 	switch d.Network {
-	case "builtin":
+	case "builtin", "user":
 		minPort, maxPort, err := parsePortRange(d.LocalPorts)
 		log.Debugf("port range: %d -> %d", minPort, maxPort)
 		if err != nil {
@@ -412,7 +413,7 @@ func (d *Driver) Start() error {
 	)
 
 	switch d.Network {
-	case "builtin":
+	case "builtin", "user":
 		startCmd = append(startCmd,
 			"-nic", fmt.Sprintf("user,model=virtio,hostfwd=tcp::%d-:22,hostfwd=tcp::%d-:2376,hostname=%s", d.SSHPort, d.EnginePort, d.GetMachineName()),
 		)
@@ -459,7 +460,7 @@ func (d *Driver) Start() error {
 	}
 
 	switch d.Network {
-	case "builtin":
+	case "builtin", "user":
 		d.IPAddress = "127.0.0.1"
 	case "socket_vmnet":
 		var err error
diff --git a/pkg/minikube/cluster/ip.go b/pkg/minikube/cluster/ip.go
index 82b801c245..4737ff3f57 100644
--- a/pkg/minikube/cluster/ip.go
+++ b/pkg/minikube/cluster/ip.go
@@ -58,9 +58,7 @@ func HostIP(host *host.Host, clusterName string) (net.IP, error) {
 			return []byte{}, errors.Wrap(err, "Error converting VM/Host IP address to IPv4 address")
 		}
 		return net.IPv4(vmIP[0], vmIP[1], vmIP[2], byte(1)), nil
-	case driver.QEMU:
-		fallthrough
-	case driver.QEMU2:
+	case driver.QEMU, driver.QEMU2:
 		ipString, err := host.Driver.GetIP()
 		if err != nil {
 			return []byte{}, errors.Wrap(err, "Error getting IP address")
diff --git a/pkg/network/network.go b/pkg/network/network.go
index 5a0179a119..2e9e4e8b4a 100644
--- a/pkg/network/network.go
+++ b/pkg/network/network.go
@@ -181,8 +181,11 @@ var isSubnetTaken = func(subnet string) (bool, error) {
 	return false, nil
 }
 
-// IsBuiltin returns if network is builtin.
+// IsBuiltin returns if network is builtin or the legacy value user.
 func IsBuiltin(network string) bool {
+	if network == "user" {
+		return true
+	}
 	return network == "builtin"
 }