Fix hostresolver setting for VZ, but disable it by default

Since it was implicitly disabled for VZ, we cannot simply fix the bug,
but change the default to match the previous de-facto default.

See #4089 for more info.

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

Author: jandubois

pkg/cidata/cidata.go

@@ -275,12 +275,12 @@ func templateArgs(ctx context.Context, bootScripts bool, instDir, name string, i
 		for _, addr := range instConfig.DNS {
 			args.DNSAddresses = append(args.DNSAddresses, addr.String())
 		}
-	case firstUsernetIndex != -1 || *instConfig.VMType == limatype.VZ:
-		args.DNSAddresses = append(args.DNSAddresses, args.SlirpDNS)
 	case *instConfig.HostResolver.Enabled:
 		args.UDPDNSLocalPort = udpDNSLocalPort
 		args.TCPDNSLocalPort = tcpDNSLocalPort
 		args.DNSAddresses = append(args.DNSAddresses, args.SlirpDNS)
+	case firstUsernetIndex != -1 || *instConfig.VMType == limatype.VZ:
+		args.DNSAddresses = append(args.DNSAddresses, args.SlirpDNS)
 	default:
 		args.DNSAddresses, err = osutil.DNSAddresses()
 		if err != nil {

pkg/driver/vz/vz_driver_darwin.go

@@ -131,6 +131,10 @@ func (l *LimaVzDriver) FillConfig(ctx context.Context, cfg *limatype.LimaYAML, _
 		cfg.MountType = ptr.Of(limatype.VIRTIOFS)
 	}
 
+	if cfg.HostResolver.Enabled == nil {
+		cfg.HostResolver.Enabled = ptr.Of(false)
+	}
+
 	//nolint:staticcheck // Migration of top-level Rosetta if specified
 	if (cfg.VMOpts.VZ.Rosetta.Enabled == nil && cfg.VMOpts.VZ.Rosetta.BinFmt == nil) && (!isEmpty(cfg.Rosetta)) {
 		logrus.Debug("Migrating top-level Rosetta configuration to vmOpts.vz.rosetta")

pkg/driverutil/vm.go

@@ -14,6 +14,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/lima-vm/lima/v2/pkg/limatype"
+	"github.com/lima-vm/lima/v2/pkg/ptr"
 	"github.com/lima-vm/lima/v2/pkg/registry"
 )
 
@@ -47,6 +48,10 @@ func validateConfigAgainstDriver(ctx context.Context, y *limatype.LimaYAML, file
 		return err
 	}
 
+	if y.HostResolver.Enabled == nil {
+		y.HostResolver.Enabled = ptr.Of(true)
+	}
+
 	return nil
 }
 

pkg/limayaml/defaults.go

@@ -538,9 +538,7 @@ func FillDefault(ctx context.Context, y, d, o *limatype.LimaYAML, filePath strin
 	if o.HostResolver.Enabled != nil {
 		y.HostResolver.Enabled = o.HostResolver.Enabled
 	}
-	if y.HostResolver.Enabled == nil {
-		y.HostResolver.Enabled = ptr.Of(true)
-	}
+	// Default will be filled in by driver (true, except for VZ)
 
 	if y.HostResolver.IPv6 == nil {
 		y.HostResolver.IPv6 = d.HostResolver.IPv6

pkg/limayaml/defaults_test.go

@@ -139,6 +139,7 @@ func TestFillDefault(t *testing.T) {
 	// their values are retained and defaults for their fields are applied correctly.
 	y = limatype.LimaYAML{
 		HostResolver: limatype.HostResolver{
+			Enabled: ptr.Of(true),
 			Hosts: map[string]string{
 				"MY.Host": "host.lima.internal",
 			},

templates/default.yaml

@@ -565,7 +565,7 @@ propagateProxyEnv: null
 # can only work when using a vmnet network interface and the host has working
 # IPv6 configured as well.
 hostResolver:
-  # 🟢 Builtin default: true
+  # 🟢 Builtin default: true (except for vmType: vz, where it is false)
   enabled: null
   # 🟢 Builtin default: false
   ipv6: null