add user-mode networking option on hyperv

Signed-off-by: lstocchi <[email protected]>

Author: lstocchi

cmd/macadam/init.go

@@ -32,8 +32,8 @@ var (
 		ValidArgsFunction: completion.AutocompleteNone,
 	}
 
-	initOptsFromFlags = define.InitOptions{}
-	// initOptionalFlags  = InitOptionalFlags{}
+	initOptsFromFlags  = define.InitOptions{}
+	initOptionalFlags  = InitOptionalFlags{}
 	defaultMachineName = "macadam"
 	// now                bool
 )
@@ -78,6 +78,10 @@ func init() {
 	flags.Uint64VarP(&initOptsFromFlags.Memory, memoryFlagName, "m", 4096, "Memory in MiB")
 	_ = initCmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone)
 
+	userModeNetFlagName := "user-mode-networking"
+	flags.BoolVar(&initOptionalFlags.UserModeNetworking, userModeNetFlagName, false,
+		"Whether this machine should use user-mode networking, routing traffic through a host user-space process")
+
 	/* flags := initCmd.Flags()
 	cfg := registry.PodmanConfig()
 
@@ -138,11 +142,7 @@ func init() {
 	_ = initCmd.RegisterFlagCompletionFunc(IgnitionPathFlagName, completion.AutocompleteDefault)
 
 	rootfulFlagName := "rootful"
-	flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution")
-
-	userModeNetFlagName := "user-mode-networking"
-	flags.BoolVar(&initOptionalFlags.UserModeNetworking, userModeNetFlagName, false,
-		"Whether this machine should use user-mode networking, routing traffic through a host user-space process") */
+	flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution") */
 }
 
 func initMachine(cmd *cobra.Command, args []string) error {
@@ -151,7 +151,7 @@ func initMachine(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := preflights.RunPreflights(vmProvider); err != nil {
+	if err := preflights.RunPreflights(vmProvider, initOptionalFlags.UserModeNetworking); err != nil {
 		slog.Error(err.Error())
 		os.Exit(1)
 	}
@@ -210,6 +210,7 @@ func initMachine(cmd *cobra.Command, args []string) error {
 		HasReadyUnit:   false,
 		ForwardSockets: false,
 	}
+	initOpts.UserModeNetworking = &initOptionalFlags.UserModeNetworking
 	/*
 		_, _, err = shim.VMExists(machineName, []vmconfigs.VMProvider{provider})
 		if err == nil {

cmd/macadam/preflight.go

@@ -29,5 +29,5 @@ func preflight(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	return preflights.RunPreflights(vmProvider)
+	return preflights.RunPreflights(vmProvider, false)
 }

go.mod

@@ -190,6 +190,6 @@ require (
 	tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
 )
 
-replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225
+replace github.com/containers/podman/v5 => github.com/lstocchi/podman/v5 v5.0.0-20250829132130-204feaa03b25
 
 replace github.com/crc-org/machine => github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078

go.sum

@@ -33,8 +33,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078 h1:KpgRncgq6ZiWDnLe6R58dJjd6QSuU7RDqRrpl11Dxcg=
 github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078/go.mod h1:trWeQimjfE3dJ8qWOxI4ePtYm13aecK42bf01s6h/Nc=
-github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225 h1:6mU03Tns0Xxi+E0pp8E7VC3QaaDLNloZWF+URuALRg0=
-github.com/cfergeau/podman/v5 v5.0.0-20250827094930-c4e064e63225/go.mod h1:AkMebnGmyIu6vXJnzObFM7huGUfkdQhQ+vqRw7Qo9l4=
 github.com/checkpoint-restore/checkpointctl v1.3.0 h1:bNz5b6s+lxFdG5ZGDba3qSkBtXDDTCG2494dfAbQJ4E=
 github.com/checkpoint-restore/checkpointctl v1.3.0/go.mod h1:dqZH4wDvbjnsqFGK2LdUDk21yFQ1dCAtzgRMlG44KDM=
 github.com/checkpoint-restore/go-criu/v7 v7.2.0 h1:qGiWA4App1gGlEfIJ68WR9jbezV9J7yZdjzglezcqKo=
@@ -244,6 +242,8 @@ github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2T
 github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
 github.com/lima-vm/go-qcow2reader v0.6.0 h1:dNstUGQxEUPbmiiVnu/cek2x7scrHe2VJy5JseLLflo=
 github.com/lima-vm/go-qcow2reader v0.6.0/go.mod h1:ay45SlGOzU+2Vc21g5/lmQgPn7Hmf0JpPhm8cuOK1FI=
+github.com/lstocchi/podman/v5 v5.0.0-20250829132130-204feaa03b25 h1:cHflj+1lfo6OYuAPWVTbvndMtDAxJdQpcR6360ltHT0=
+github.com/lstocchi/podman/v5 v5.0.0-20250829132130-204feaa03b25/go.mod h1:AkMebnGmyIu6vXJnzObFM7huGUfkdQhQ+vqRw7Qo9l4=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=

pkg/preflights/preflights.go

@@ -12,8 +12,8 @@ import (
 	"github.com/containers/podman/v5/pkg/machine/vmconfigs"
 )
 
-func RunPreflights(provider vmconfigs.VMProvider) error {
-	if err := checkGvproxyVersion(provider); err != nil {
+func RunPreflights(provider vmconfigs.VMProvider, userModeNetworking bool) error {
+	if err := checkGvproxyVersion(provider, userModeNetworking); err != nil {
 		return fmt.Errorf("invalid gvproxy binary: %w", err)
 	}
 
@@ -30,8 +30,8 @@ func RunPreflights(provider vmconfigs.VMProvider) error {
 
 // macadam/podman needs a gvproxy version which supports the --services
 // argument
-func checkGvproxyVersion(provider vmconfigs.VMProvider) error {
-	if provider.VMType() == define.WSLVirt || provider.VMType() == define.HyperVVirt {
+func checkGvproxyVersion(provider vmconfigs.VMProvider, userModeNetworking bool) error {
+	if provider.VMType() == define.WSLVirt || (provider.VMType() == define.HyperVVirt && !userModeNetworking) {
 		return nil
 	}
 	if err := checkBinaryArg(machine.ForwarderBinaryName, "-services"); err != nil {