Merge pull request #1612 from balajiv113/fix-vz-test

Fix rosetta for amd64 and default ip for slirp network in vz driver

Author: AkihiroSuda

hack/test-example.sh

@@ -66,8 +66,6 @@ case "$NAME" in
 	CHECKS["user-v2"]=1
 	;;
 "vz")
-	CHECKS["systemd-strict"]=
-	CHECKS["port-forwards"]=""
 	CHECKS["snapshot-online"]=""
 	CHECKS["snapshot-offline"]=""
 	;;

pkg/limayaml/defaults.go

@@ -577,13 +577,17 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 	caCerts := unique(append(append(d.CACertificates.Certs, y.CACertificates.Certs...), o.CACertificates.Certs...))
 	y.CACertificates.Certs = caCerts
 
-	if y.Rosetta.Enabled == nil {
-		y.Rosetta.Enabled = d.Rosetta.Enabled
-	}
-	if o.Rosetta.Enabled != nil {
-		y.Rosetta.Enabled = o.Rosetta.Enabled
-	}
-	if y.Rosetta.Enabled == nil {
+	if runtime.GOOS == "darwin" && IsNativeArch(AARCH64) {
+		if y.Rosetta.Enabled == nil {
+			y.Rosetta.Enabled = d.Rosetta.Enabled
+		}
+		if o.Rosetta.Enabled != nil {
+			y.Rosetta.Enabled = o.Rosetta.Enabled
+		}
+		if y.Rosetta.Enabled == nil {
+			y.Rosetta.Enabled = pointer.Bool(false)
+		}
+	} else {
 		y.Rosetta.Enabled = pointer.Bool(false)
 	}
 

pkg/limayaml/defaults_test.go

@@ -378,9 +378,16 @@ func TestFillDefault(t *testing.T) {
 		"-----BEGIN CERTIFICATE-----\nYOUR-ORGS-TRUSTED-CA-CERT\n-----END CERTIFICATE-----\n",
 	}
 
-	expect.Rosetta = Rosetta{
-		Enabled: pointer.Bool(true),
-		BinFmt:  pointer.Bool(true),
+	if runtime.GOOS == "darwin" && IsNativeArch(AARCH64) {
+		expect.Rosetta = Rosetta{
+			Enabled: pointer.Bool(true),
+			BinFmt:  pointer.Bool(true),
+		}
+	} else {
+		expect.Rosetta = Rosetta{
+			Enabled: pointer.Bool(false),
+			BinFmt:  pointer.Bool(true),
+		}
 	}
 
 	y = LimaYAML{}

pkg/networks/usernet/gvproxy.go

@@ -29,6 +29,8 @@ type GVisorNetstackOpts struct {
 	Endpoint   string
 
 	Async bool
+
+	DefaultLeases map[string]string
 }
 
 var (
@@ -38,6 +40,13 @@ var (
 func StartGVisorNetstack(ctx context.Context, gVisorOpts *GVisorNetstackOpts) error {
 	opts = gVisorOpts
 
+	leases := map[string]string{}
+	if opts.DefaultLeases != nil {
+		for k, v := range opts.DefaultLeases {
+			leases[k] = v
+		}
+	}
+	leases[networks.SlirpGateway] = "5a:94:ef:e4:0c:df"
 	// The way gvisor-tap-vsock implemented slirp is different from tradition SLIRP,
 	// - GatewayIP handling all request, also answers DNS queries
 	// - based on NAT configuration, gateway forwards and translates calls to host
@@ -50,12 +59,10 @@ func StartGVisorNetstack(ctx context.Context, gVisorOpts *GVisorNetstackOpts) er
 		Subnet:            networks.SlirpNetwork,
 		GatewayIP:         networks.SlirpDNS,
 		GatewayMacAddress: "5a:94:ef:e4:0c:dd",
-		DHCPStaticLeases: map[string]string{
-			networks.SlirpGateway: "5a:94:ef:e4:0c:df",
-		},
-		Forwards:         map[string]string{},
-		DNS:              []types.Zone{},
-		DNSSearchDomains: searchDomains(),
+		DHCPStaticLeases:  leases,
+		Forwards:          map[string]string{},
+		DNS:               []types.Zone{},
+		DNSSearchDomains:  searchDomains(),
 		NAT: map[string]string{
 			networks.SlirpGateway: "127.0.0.1",
 		},

pkg/vz/vm_darwin.go

@@ -129,6 +129,9 @@ func startUsernet(ctx context.Context, driver *driver.BaseDriver) (*usernet.Clie
 			Endpoint: endpointSock,
 			FdSocket: vzSock,
 			Async:    true,
+			DefaultLeases: map[string]string{
+				networks.SlirpIPAddress: limayaml.MACAddress(driver.Instance.Dir),
+			},
 		})
 		if err != nil {
 			return nil, err