Hostgateway rough solution without testing

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

.gitignore

@@ -11,3 +11,4 @@ tmp/
 .vscode/
 tools_bin/
 test-coverage.*
+restart_test

cmd/finch/nerdctl.go

@@ -129,6 +129,8 @@ func (nc *nerdctlCommand) run(cmdName string, args []string) error {
 				resolvedIP := resolveIP(nc.fc, arg[11:], nc.logger)
 				arg = fmt.Sprintf("%s%s", arg[0:11], resolvedIP)
 			}
+			nerdctlArgs = append(nerdctlArgs, "--host-gateway-ip")
+			nerdctlArgs = append(nerdctlArgs, *nc.fc.HostGatewayIP)
 			nerdctlArgs = append(nerdctlArgs, arg)
 		case strings.HasPrefix(arg, "-v") || strings.HasPrefix(arg, "--volume"):
 			// TODO: remove the case branch when the Nerdctl fix is released to Finch.
@@ -353,11 +355,8 @@ func resolveIP(fc *config.Finch, host string, logger flog.Logger) string {
 	// access host from the containers.
 	// TODO: make the host gateway ip configurable.
 	if parts[1] == dockerops.HostGatewayName {
-		resolvedIP := *fc.HostGatewayIP
-		logger.Debugf(`Resolving special IP "host-gateway" to %q for host %q`, resolvedIP, parts[0])
-		return fmt.Sprintf("%s:%s", parts[0], resolvedIP)
+		logger.Debugf(`Resolving special IP "host-gateway" to %q for host %q`, *fc.HostGatewayIP, parts[0])
 	}
-	fmt.Fprint(os.Stderr, host)
 	return host
 }
 

cmd/finch/nerdctl_test.go

@@ -376,7 +376,7 @@ func TestNerdctlCommand_run(t *testing.T) {
 				ncsd.EXPECT().LookupEnv("COSIGN_PASSWORD").Return("", false)
 				c := mocks.NewCommand(ctrl)
 				lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "run",
-					"--rm", "--add-host", "name:192.168.5.2", "alpine:latest").Return(c)
+					"--rm", "--host-gateway-ip", "192.168.5.2", "--add-host", "name:host-gateway", "alpine:latest").Return(c)
 				c.EXPECT().Run()
 			},
 		},
@@ -401,7 +401,7 @@ func TestNerdctlCommand_run(t *testing.T) {
 				ncsd.EXPECT().LookupEnv("COSIGN_PASSWORD").Return("", false)
 				c := mocks.NewCommand(ctrl)
 				lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "run",
-					"--rm", "--add-host", "name:0.0.0.0", "alpine:latest").Return(c)
+					"--rm", "--host-gateway-ip", "192.168.5.2", "--add-host", "name:0.0.0.0", "alpine:latest").Return(c)
 				c.EXPECT().Run()
 			},
 		},
@@ -426,7 +426,7 @@ func TestNerdctlCommand_run(t *testing.T) {
 				ncsd.EXPECT().LookupEnv("COSIGN_PASSWORD").Return("", false)
 				c := mocks.NewCommand(ctrl)
 				lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "run",
-					"--rm", "--add-host", "alpine:latest").Return(c)
+					"--rm", "--host-gateway-ip", "192.168.5.2", "--add-host", "alpine:latest").Return(c)
 				c.EXPECT().Run().Return(errors.New("run cmd error"))
 			},
 		},
@@ -452,7 +452,7 @@ func TestNerdctlCommand_run(t *testing.T) {
 				ncsd.EXPECT().LookupEnv("COSIGN_PASSWORD").Return("", false)
 				c := mocks.NewCommand(ctrl)
 				lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "run",
-					"--rm", "--add-host=name:192.168.5.2", "alpine:latest").Return(c)
+					"--rm", "--host-gateway-ip", "192.168.5.2", "--add-host=name:host-gateway", "alpine:latest").Return(c)
 				c.EXPECT().Run()
 			},
 		},
@@ -477,7 +477,7 @@ func TestNerdctlCommand_run(t *testing.T) {
 				ncsd.EXPECT().LookupEnv("COSIGN_PASSWORD").Return("", false)
 				c := mocks.NewCommand(ctrl)
 				lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "run",
-					"--rm", "--add-host=name:0.0.0.0", "alpine:latest").Return(c)
+					"--rm", "--host-gateway-ip", "192.168.5.2", "--add-host=name:0.0.0.0", "alpine:latest").Return(c)
 				c.EXPECT().Run()
 			},
 		},

pkg/config/config.go

@@ -51,7 +51,7 @@ type Finch struct {
 	// This setting will only be applied on vm init.
 	Rosetta *bool `yaml:"rosetta,omitempty"`
 	// Configurable hostgateway IP
-	HostGatewayIP *string `yaml:"host-gateway-ip"`
+	HostGatewayIP *string `yaml:"host-gateway-ip,omitempty"`
 }
 
 // Nerdctl is a copy from github.com/containerd/nerdctl/cmd/nerdctl/main.go

pkg/config/config_test.go

@@ -46,6 +46,7 @@ cpus: 8
 				CPUs:    pointer.Int(8),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 			wantErr: nil,
 		},
@@ -62,6 +63,7 @@ cpus: 8
 				CPUs:    pointer.Int(2),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 			wantErr: nil,
 		},
@@ -78,6 +80,7 @@ cpus: 8
 				CPUs:    pointer.Int(2),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 			wantErr: nil,
 		},
@@ -94,6 +97,7 @@ cpus: 8
 				CPUs:    pointer.Int(2),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 			wantErr: nil,
 		},
@@ -110,6 +114,7 @@ cpus: 8
 				CPUs:    pointer.Int(2),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 			wantErr: nil,
 		},

pkg/config/defaults_test.go

@@ -35,6 +35,7 @@ func Test_applyDefaults(t *testing.T) {
 				Memory:  pointer.String("3GiB"),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 		},
 		{
@@ -50,6 +51,7 @@ func Test_applyDefaults(t *testing.T) {
 				Memory:  pointer.String("4GiB"),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 		},
 		{
@@ -66,6 +68,7 @@ func Test_applyDefaults(t *testing.T) {
 				Memory:  pointer.String("3GiB"),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 		},
 		{
@@ -81,6 +84,7 @@ func Test_applyDefaults(t *testing.T) {
 				Memory:  pointer.String("2GiB"),
 				VMType:  pointer.String("qemu"),
 				Rosetta: pointer.Bool(false),
+				HostGatewayIP: pointer.String("192.168.5.2"),
 			},
 		},
 	}