POD-1244 | Init network rework

cmd/agent/container/container.go

@@ -18,5 +18,6 @@ func NewContainerCmd(flags *flags.GlobalFlags) *cobra.Command {
 	containerCmd.AddCommand(NewOpenVSCodeAsyncCmd())
 	containerCmd.AddCommand(NewCredentialsServerCmd(flags))
 	containerCmd.AddCommand(NewSetupLoftPlatformAccessCmd(flags))
+	containerCmd.AddCommand(NewNetworkDaemonCmd(flags))
 	return containerCmd
 }

cmd/agent/container/network_daemon.go

@@ -0,0 +1,54 @@
+package container
+
+import (
+	"context"
+	"fmt"
+	"net"
+
+	"github.com/loft-sh/devpod/cmd/flags"
+	"github.com/loft-sh/devpod/pkg/tailscale"
+	"github.com/spf13/cobra"
+)
+
+// NetworkDaemonCmd holds the cmd flags
+type NetworkDaemonCmd struct {
+	*flags.GlobalFlags
+
+	AccessKey       string
+	PlatformHost    string
+	NetworkHostname string
+}
+
+// NewDaemonCmd creates a new command
+func NewNetworkDaemonCmd(flags *flags.GlobalFlags) *cobra.Command {
+	cmd := &NetworkDaemonCmd{
+		GlobalFlags: flags,
+	}
+	daemonCmd := &cobra.Command{
+		Use:   "network-daemon",
+		Short: "Starts tailscale network daemon",
+		Args:  cobra.NoArgs,
+		RunE:  cmd.Run,
+	}
+	daemonCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "")
+	daemonCmd.Flags().StringVar(&cmd.PlatformHost, "host", "", "")
+	daemonCmd.Flags().StringVar(&cmd.NetworkHostname, "hostname", "", "")
+	return daemonCmd
+}
+
+// Run runs the command logic
+func (cmd *NetworkDaemonCmd) Run(_ *cobra.Command, _ []string) error {
+	tsNet := tailscale.NewTSNet(&tailscale.TSNetConfig{
+		AccessKey: cmd.AccessKey,
+		Host:      tailscale.RemoveProtocol(cmd.PlatformHost),
+		Hostname:  cmd.NetworkHostname,
+		PortHandlers: map[string]func(net.Listener){
+			"8022": tailscale.ReverseProxyHandler("127.0.0.1:8022"),
+		},
+	})
+	if err := tsNet.Start(context.TODO()); err != nil {
+		return fmt.Errorf("cannot start tsNet server: %w", err)
+	}
+
+	return nil
+}

cmd/agent/container/setup.go

@@ -52,6 +52,9 @@ type SetupContainerCmd struct {
 	InjectGitCredentials   bool
 	ContainerWorkspaceInfo string
 	SetupInfo              string
+	AccessKey              string
+	PlatformHost           string
+	NetworkHostname        string
 }
 
 // NewSetupContainerCmd creates a new command
@@ -72,6 +75,8 @@ func NewSetupContainerCmd(flags *flags.GlobalFlags) *cobra.Command {
 	setupContainerCmd.Flags().BoolVar(&cmd.InjectGitCredentials, "inject-git-credentials", false, "If DevPod should inject git credentials during setup")
 	setupContainerCmd.Flags().StringVar(&cmd.ContainerWorkspaceInfo, "container-workspace-info", "", "The container workspace info")
 	setupContainerCmd.Flags().StringVar(&cmd.SetupInfo, "setup-info", "", "The container setup info")
+	setupContainerCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "Access Key to use")
+	setupContainerCmd.Flags().StringVar(&cmd.NetworkHostname, "network-hostname", "", "Network hostname to use")
 	_ = setupContainerCmd.MarkFlagRequired("setup-info")
 	return setupContainerCmd
 }
@@ -202,6 +207,35 @@ func (cmd *SetupContainerCmd) Run(ctx context.Context) error {
 		}
 	}
 
+	// start tailscale networking daemon
+	if (cmd.AccessKey != "" && cmd.NetworkHostname != "") || true { // FIXME
+		err = single.Single("network.daemon.pid", func() (*exec.Cmd, error) {
+			logger.Infof("Start DevPod Networking Daemon")
+			binaryPath, err := os.Executable()
+			if err != nil {
+				return nil, err
+			}
+
+			return exec.Command(binaryPath, "agent", "container", "network-daemon", "--access-key", cmd.AccessKey, "--host", "host.docker.internal:8080", "--hostname", cmd.NetworkHostname), nil
+		})
+		if err != nil {
+			return err
+		}
+
+		err = single.Single("ssh.daemon.pid", func() (*exec.Cmd, error) {
+			logger.Infof("Start DevPod Networking Daemon")
+			binaryPath, err := os.Executable()
+			if err != nil {
+				return nil, err
+			}
+
+			return exec.Command(binaryPath, "helper", "ssh-server"), nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+
 	out, err := json.Marshal(setupInfo)
 	if err != nil {
 		return fmt.Errorf("marshal setup info: %w", err)

cmd/agent/container/setup_loft_platform_access.go

@@ -71,13 +71,13 @@ func (c *SetupLoftPlatformAccessCmd) Run(_ *cobra.Command, args []string) error
 	err = loftconfig.AuthDevpodCliToPlatform(loftConfig, logger)
 	if err != nil {
 		// log error but don't return to allow other CLIs to install as well
-		logger.Warn("unable to authenticate devpod cli: %v", err)
+		logger.Warnf("unable to authenticate devpod cli: %w", err)
 	}
 
 	err = loftconfig.AuthVClusterCliToPlatform(loftConfig, logger)
 	if err != nil {
 		// log error but don't return to allow other CLIs to install as well
-		logger.Warn("unable to authenticate vcluster cli: %v", err)
+		logger.Warnf("unable to authenticate vcluster cli: %w", err)
 	}
 
 	return nil

cmd/build.go

@@ -88,6 +88,7 @@ func NewBuildCmd(flags *flags.GlobalFlags) *cobra.Command {
 				cmd.UID,
 				false,
 				log.Default,
+				"",
 			)
 			if err != nil {
 				return err