Define additional network interfaces via cloud-init

Signed-off-by: Jan Dubois <[email protected]>

Author: jandubois

pkg/cidata/cidata.TEMPLATE.d/network-config

@@ -0,0 +1,9 @@
+version: 2
+ethernets:
+  {{- range $i, $addr := .MACAddresses}}
+  eth{{$i}}:
+    match:
+      macaddress: '{{$addr}}'
+    dhcp4: true
+    set-name: eth{{$i}}
+  {{- end }}

pkg/cidata/cidata.go

@@ -15,7 +15,9 @@ import (
 	"github.com/AkihiroSuda/lima/pkg/iso9660util"
 	"github.com/AkihiroSuda/lima/pkg/limayaml"
 	"github.com/AkihiroSuda/lima/pkg/localpathutil"
+	"github.com/AkihiroSuda/lima/pkg/qemu"
 	"github.com/AkihiroSuda/lima/pkg/sshutil"
+	"github.com/AkihiroSuda/lima/pkg/store/filenames"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -32,7 +34,7 @@ var (
 	}
 )
 
-func GenerateISO9660(isoPath, name string, y *limayaml.LimaYAML) error {
+func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML) error {
 	if err := limayaml.ValidateRaw(*y); err != nil {
 		return err
 	}
@@ -70,6 +72,11 @@ func GenerateISO9660(isoPath, name string, y *limayaml.LimaYAML) error {
 		args.Mounts = append(args.Mounts, expanded)
 	}
 
+	args.MACAddresses = append(args.MACAddresses, qemu.SlirpMACAddress)
+	if y.Network.VDE.URL != "" {
+		args.MACAddresses = append(args.MACAddresses, qemu.MACAddress(instDir, y))
+	}
+
 	if err := ValidateTemplateArgs(args); err != nil {
 		return err
 	}
@@ -147,7 +154,7 @@ func GenerateISO9660(isoPath, name string, y *limayaml.LimaYAML) error {
 		})
 	}
 
-	return iso9660util.Write(isoPath, "cidata", layout)
+	return iso9660util.Write(filepath.Join(instDir, filenames.CIDataISO), "cidata", layout)
 }
 
 func GuestAgentBinary(arch string) (io.ReadCloser, error) {

pkg/cidata/template.go

@@ -24,12 +24,13 @@ type Containerd struct {
 	User   bool
 }
 type TemplateArgs struct {
-	Name       string // instance name
-	User       string // user name
-	UID        int
-	SSHPubKeys []string
-	Mounts     []string // abs path, accessible by the User
-	Containerd Containerd
+	Name         string // instance name
+	User         string // user name
+	UID          int
+	SSHPubKeys   []string
+	Mounts       []string // abs path, accessible by the User
+	Containerd   Containerd
+	MACAddresses []string
 }
 
 func ValidateTemplateArgs(args TemplateArgs) error {

pkg/qemu/qemu.go

@@ -133,10 +133,14 @@ func appendArgsIfNoConflict(args []string, k, v string) []string {
 	return append(args, k, v)
 }
 
-func macAddress(cfg Config) string {
-	addr := cfg.LimaYAML.Network.VDE.MACAddress
+const (
+	SlirpMACAddress = "22:11:11:11:11:11"
+)
+
+func MACAddress(instanceDir string, y *limayaml.LimaYAML) string {
+	addr := y.Network.VDE.MACAddress
 	if addr == "" {
-		sha := sha256.Sum256([]byte(cfg.InstanceDir))
+		sha := sha256.Sum256([]byte(instanceDir))
 		// According to https://gitlab.com/wireshark/wireshark/-/blob/master/manuf
 		// no well-known MAC addresses start with 0x22.
 		hw := append(net.HardwareAddr{0x22}, sha[0:5]...)
@@ -209,12 +213,12 @@ func Cmdline(cfg Config) (string, []string, error) {
 
 	// Network
 	if y.Network.VDE.URL != "" {
-		args = append(args, "-device", fmt.Sprintf("virtio-net-pci,netdev=net0,mac=%s", macAddress(cfg)))
 		args = append(args, "-netdev", fmt.Sprintf("vde,id=net0,sock=%s", y.Network.VDE.URL))
+		args = append(args, "-device", fmt.Sprintf("virtio-net-pci,netdev=net0,mac=%s", MACAddress(cfg.InstanceDir, y)))
 	}
 	// CIDR is intentionally hardcoded to 192.168.5.0/24, as each of QEMU has its own independent slirp network.
-	args = append(args, "-device", "virtio-net-pci,netdev=net1")
 	args = append(args, "-netdev", fmt.Sprintf("user,id=net1,net=192.168.5.0/24,hostfwd=tcp:127.0.0.1:%d-:22", y.SSH.LocalPort))
+	args = append(args, "-device", "virtio-net-pci,netdev=net1,mac="+SlirpMACAddress)
 
 	// virtio-rng-pci acceralates starting up the OS, according to https://wiki.gentoo.org/wiki/QEMU/Options
 	args = append(args, "-device", "virtio-rng-pci")

pkg/start/start.go

@@ -19,8 +19,7 @@ import (
 )
 
 func ensureDisk(ctx context.Context, instName, instDir string, y *limayaml.LimaYAML) error {
-	cidataISOPath := filepath.Join(instDir, filenames.CIDataISO)
-	if err := cidata.GenerateISO9660(cidataISOPath, instName, y); err != nil {
+	if err := cidata.GenerateISO9660(instDir, instName, y); err != nil {
 		return err
 	}
 	qCfg := qemu.Config{