add support to new builtin value on existing cluster

pull/15793/head
Steven Powell 2023-02-09 10:27:16 -08:00
parent c417258f9c
commit 0b7c0810c9
3 changed files with 11 additions and 9 deletions

View File

@ -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

View File

@ -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")

View File

@ -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"
}