Merge pull request #518 from rancher-sandbox/cidata-slirpipaddress

Add LIMA_CIDATA_SLIRP_IP_ADDRESS setting to lima.env

Author: AkihiroSuda

docs/internal.md

@@ -112,5 +112,6 @@ The volume label is "cidata", as defined by [cloud-init NoCloud](https://cloudin
 - `LIMA_CIDATA_CONTAINERD_SYSTEM`: set to "1" if system-wide containerd to be set up
 - `LIMA_CIDATA_SLIRP_GATEWAY`: set to the IP address of the host on the SLIRP network. `192.168.5.2`.
 - `LIMA_CIDATA_SLIRP_DNS`: set to the IP address of the DNS on the SLIRP network. `192.168.5.3`.
+- `LIMA_CIDATA_SLIRP_IP_ADDRESS`: set to the IP address of the guest on the SLIRP network. `192.168.5.15`.
 - `LIMA_CIDATA_UDP_DNS_LOCAL_PORT`: set to the udp port number of the hostagent dns server (or 0 when not enabled).
 - `LIMA_CIDATA_TCP_DNS_LOCAL_PORT`: set to the tcp port number of the hostagent dns server (or 0 when not enabled).

pkg/cidata/cidata.TEMPLATE.d/lima.env

@@ -17,5 +17,6 @@ LIMA_CIDATA_CONTAINERD_SYSTEM=
 {{- end}}
 LIMA_CIDATA_SLIRP_DNS={{.SlirpDNS}}
 LIMA_CIDATA_SLIRP_GATEWAY={{.SlirpGateway}}
+LIMA_CIDATA_SLIRP_IP_ADDRESS={{.SlirpIPAddress}}
 LIMA_CIDATA_UDP_DNS_LOCAL_PORT={{.UDPDNSLocalPort}}
 LIMA_CIDATA_TCP_DNS_LOCAL_PORT={{.TCPDNSLocalPort}}

pkg/cidata/cidata.go

@@ -96,13 +96,14 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		return err
 	}
 	args := TemplateArgs{
-		Name:         name,
-		User:         u.Username,
-		UID:          uid,
-		Containerd:   Containerd{System: *y.Containerd.System, User: *y.Containerd.User},
-		SlirpNICName: qemu.SlirpNICName,
-		SlirpGateway: qemu.SlirpGateway,
-		SlirpDNS:     qemu.SlirpDNS,
+		Name:           name,
+		User:           u.Username,
+		UID:            uid,
+		Containerd:     Containerd{System: *y.Containerd.System, User: *y.Containerd.User},
+		SlirpNICName:   qemu.SlirpNICName,
+		SlirpGateway:   qemu.SlirpGateway,
+		SlirpDNS:       qemu.SlirpDNS,
+		SlirpIPAddress: qemu.SlirpIPAddress,
 	}
 
 	// change instance id on every boot so network config will be processed again

pkg/cidata/template.go

@@ -39,6 +39,7 @@ type TemplateArgs struct {
 	SlirpNICName    string
 	SlirpGateway    string
 	SlirpDNS        string
+	SlirpIPAddress  string
 	UDPDNSLocalPort int
 	TCPDNSLocalPort int
 	Env             map[string]string