fix: missing netstat (#3567) (#3569)

loft-bot · FabianKramm · web-flow · commit 4706db240c81 · 2026-02-09T15:40:58.000+01:00
* fix: missing netstat * refactor: make sure docker driver is mentioned (cherry picked from commit eb43786) Co-authored-by: Fabian Kramm <fab.kramm@googlemail.com>
diff --git a/cmd/vclusterctl/cmd/connect.go b/cmd/vclusterctl/cmd/connect.go
@@ -65,7 +65,7 @@ vcluster connect test -n test -- kubectl get ns
 		return cmd.Run(cobraCmd.Context(), args)
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")
 
 	connect.AddCommonFlags(cobraCmd, &cmd.ConnectOptions)
 	connect.AddPlatformFlags(cobraCmd, &cmd.ConnectOptions, "[PLATFORM] ")
diff --git a/cmd/vclusterctl/cmd/create.go b/cmd/vclusterctl/cmd/create.go
@@ -64,7 +64,7 @@ vcluster create test --namespace test
 		},
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")
 
 	create.AddCommonFlags(cobraCmd, &cmd.CreateOptions)
 	create.AddHelmFlags(cobraCmd, &cmd.CreateOptions)
diff --git a/cmd/vclusterctl/cmd/delete.go b/cmd/vclusterctl/cmd/delete.go
@@ -51,7 +51,7 @@ vcluster delete test --namespace test
 		},
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")
 
 	flagsdelete.AddCommonFlags(cobraCmd, &cmd.DeleteOptions)
 	flagsdelete.AddHelmFlags(cobraCmd, &cmd.DeleteOptions)
diff --git a/cmd/vclusterctl/cmd/describe.go b/cmd/vclusterctl/cmd/describe.go
@@ -53,7 +53,7 @@ vcluster describe -o json test
 	}
 	p, _ := defaults.Get(pdefaults.KeyProject, "")
 
-	cobraCmd.Flags().StringVar(&driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")
 	cobraCmd.Flags().StringVarP(&cmd.output, "output", "o", "", "The format to use to display the information, can either be json or yaml")
 	cobraCmd.Flags().StringVarP(&cmd.project, "project", "p", p, "The project to use")
 	cobraCmd.Flags().BoolVar(&cmd.configOnly, "config-only", false, "Return only the vcluster.yaml configuration")
diff --git a/cmd/vclusterctl/cmd/list.go b/cmd/vclusterctl/cmd/list.go
@@ -47,7 +47,7 @@ vcluster list --namespace test
 		},
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")
 	cobraCmd.Flags().StringVar(&cmd.Output, "output", "table", "Choose the format of the output. [table|json]")
 
 	return cobraCmd
diff --git a/cmd/vclusterctl/cmd/login.go b/cmd/vclusterctl/cmd/login.go
@@ -50,7 +50,7 @@ vcluster platform login https://my-vcluster-platform.com --access-key myaccesske
 		},
 	}
 
-	loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform and helm")
+	loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform, helm, and docker")
 	loginCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "The access key to use")
 	loginCmd.Flags().BoolVar(&cmd.Insecure, "insecure", true, product.Replace("Allow login into an insecure Loft instance"))
 	loginCmd.Flags().BoolVar(&cmd.DockerLogin, "docker-login", true, "If true, will log into the docker image registries the user has image pull secrets for")
diff --git a/cmd/vclusterctl/cmd/pause.go b/cmd/vclusterctl/cmd/pause.go
@@ -56,7 +56,7 @@ vcluster pause test --namespace test
 		},
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm, platform, or docker.")
 
 	// Platform flags
 	cobraCmd.Flags().StringVar(&cmd.Project, "project", "", "[PLATFORM] The vCluster platform project to use")
diff --git a/cmd/vclusterctl/cmd/platform/login.go b/cmd/vclusterctl/cmd/platform/login.go
@@ -75,7 +75,7 @@ vcluster platform login https://my-vcluster-platform.com --access-key myaccesske
 		},
 	}
 
-	loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform and helm")
+	loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform, helm, and docker")
 	loginCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "The access key to use")
 	loginCmd.Flags().BoolVar(&cmd.Insecure, "insecure", false, product.Replace("Allow login into an insecure Loft instance"))
 	loginCmd.Flags().BoolVar(&cmd.DockerLogin, "docker-login", true, "If true, will log into the docker image registries the user has image pull secrets for")
diff --git a/cmd/vclusterctl/cmd/resume.go b/cmd/vclusterctl/cmd/resume.go
@@ -52,7 +52,7 @@ vcluster resume test --namespace test
 		},
 	}
 
-	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm or platform.")
+	cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm, platform, or docker.")
 
 	// Platform flags
 	cobraCmd.Flags().StringVar(&cmd.Project, "project", "", "[PLATFORM] The vCluster platform project to use")
diff --git a/cmd/vclusterctl/cmd/use/driver.go b/cmd/vclusterctl/cmd/use/driver.go
@@ -26,13 +26,13 @@ func NewDriverCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
 	description := `########################################################
 ################# vcluster use driver #################
 ########################################################
-Either use "helm" or "platform" as the deployment method for managing virtual clusters.
+Either use "helm", "platform", or "docker" as the deployment method for managing virtual clusters.
 #######################################################
 	`
 
 	driverCmd := &cobra.Command{
 		Use:   "driver",
-		Short: "Switch the virtual clusters driver between platform and helm",
+		Short: "Switch the virtual clusters driver between platform, helm, and docker",
 		Long:  description,
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
diff --git a/pkg/cli/config/config.go b/pkg/cli/config/config.go
@@ -141,11 +141,13 @@ func PrintDriverInfo(verb string, driver DriverType, log log.Logger) {
 	switch driver {
 	case HelmDriver:
 		log.Infof("Using vCluster driver 'helm' to %s your virtual clusters, which means the vCluster CLI is running helm commands directly", verb)
-		log.Info("If you prefer to use the vCluster platform API instead, use the flag '--driver platform' or run 'vcluster use driver platform' to change the default")
+		log.Info("If you prefer to use the vCluster platform API or Docker instead, use '--driver platform' or '--driver docker', or run 'vcluster use driver platform' or 'vcluster use driver docker' to change the default")
 	case PlatformDriver:
 		log.Infof("Using vCluster driver 'platform' to %s your virtual clusters, which means the CLI is using the vCluster platform API instead of helm", verb)
-		log.Info("If you prefer to use helm instead, use the flag '--driver helm' or run 'vcluster use driver helm' to change the default")
+		log.Info("If you prefer to use helm or Docker instead, use '--driver helm' or '--driver docker', or run 'vcluster use driver helm' or 'vcluster use driver docker' to change the default")
 	case DockerDriver:
+		log.Infof("Using vCluster driver 'docker' to %s your virtual clusters, which means the CLI is managing Docker-based virtual clusters locally", verb)
+		log.Info("If you prefer to use helm or the vCluster platform API instead, use '--driver helm' or '--driver platform', or run 'vcluster use driver helm' or 'vcluster use driver platform' to change the default")
 	}
 }
 
diff --git a/pkg/cli/config/types.go b/pkg/cli/config/types.go
@@ -15,7 +15,7 @@ type CLI struct {
 }
 
 type Driver struct {
-	// Type is the current driver type that is used, either helm or platform
+	// Type is the current driver type that is used, either helm, platform, or docker
 	Type DriverType `json:"type,omitempty"`
 }
 
diff --git a/pkg/cli/create_docker.go b/pkg/cli/create_docker.go
@@ -1132,35 +1132,56 @@ func findTailIPs(ctx context.Context, networkName string, tailSize int) ([]strin
 func getDockerSocketPath(ctx context.Context) (string, error) {
 	// Updated awk regex: /\/docker\.sock(\.real)?$/
 	// This matches paths ending in "/docker.sock" OR "/docker.sock.real"
-	cmdStr := `netstat -xlp | awk '$NF ~ /\/docker\.sock(\.real)?$/ {print $NF}'`
+	cmdStr := `
+        if command -v netstat >/dev/null 2>&1; then
+            netstat -xlp | awk '$NF ~ /\/docker\.sock(\.real)?$/ {print $NF}'
+        else
+            for p in /var/run/docker.sock.real /var/run/docker.sock; do
+                if [ -S "$p" ]; then
+                    echo "$p"
+                fi
+            done
+        fi
+    `
 
-	out, err := exec.CommandContext(ctx, "docker", "run", "-q", "--rm", "--privileged", "--pid=host", "alpine", "nsenter", "-t", "1", "-m", "-p", "-u", "-i", "-n", "sh", "-c", cmdStr).CombinedOutput()
+	out, err := exec.CommandContext(ctx, "docker", "run", "-q", "--rm", "--privileged", "--pid=host", "alpine", "nsenter", "-t", "1", "-m", "-p", "-u", "-i", "-n", "sh", "-c", cmdStr).Output()
 	if err != nil {
-		return "", fmt.Errorf("failed to get docker socket path: %s: %w", string(out), err)
+		var exitErr *exec.ExitError
+		if errors.As(err, &exitErr) {
+			return "", fmt.Errorf("failed to get docker socket path: %s: %w", string(exitErr.Stderr), err)
+		}
+		return "", fmt.Errorf("failed to get docker socket path: %w", err)
 	}
 
 	scanner := bufio.NewScanner(strings.NewReader(strings.TrimSpace(string(out))))
-	dockerSocketPaths := []string{}
 	for scanner.Scan() {
-		dockerSocketPaths = append(dockerSocketPaths, scanner.Text())
+		line := strings.TrimSpace(scanner.Text())
+		// Only accept the line if it looks like an absolute path.
+		if strings.HasPrefix(line, "/") {
+			return line, nil
+		}
 	}
 	if err := scanner.Err(); err != nil {
-		return "", fmt.Errorf("failed to scan docker socket path: %s: %w", string(out), err)
-	}
-	if len(dockerSocketPaths) == 0 {
-		return "", fmt.Errorf("no docker socket path found")
+		return "", fmt.Errorf("failed to scan docker socket path: %w", err)
 	}
 
-	// Returns the first match found (e.g., /var/run/docker.sock.real)
-	return dockerSocketPaths[0], nil
+	return "", fmt.Errorf("no docker socket path found")
 }
 
 func getContainerdSocketPath(ctx context.Context) (string, error) {
-	// This automatically discards stderr (where the netstat warning lives)
-	// and only captures the clean stdout from awk.
-	cmd := exec.CommandContext(ctx, "docker", "run", "-q", "--rm", "--privileged", "--pid=host", "alpine", "nsenter", "-t", "1", "-m", "-p", "-u", "-i", "-n", "sh", "-c", `netstat -xlp | awk '$NF ~ /\/containerd\.sock$/ {print $NF}'`)
-	out, err := cmd.Output()
+	cmdStr := `
+        if command -v netstat >/dev/null 2>&1; then
+            netstat -xlp | awk '$NF ~ /\/containerd\.sock$/ {print $NF}'
+        else
+            for p in /run/containerd/containerd.sock /var/run/containerd/containerd.sock /var/run/docker/containerd/containerd.sock; do
+                if [ -S "$p" ]; then
+                    echo "$p"
+                fi
+            done
+        fi
+    `
 
+	out, err := exec.CommandContext(ctx, "docker", "run", "-q", "--rm", "--privileged", "--pid=host", "alpine", "nsenter", "-t", "1", "-m", "-p", "-u", "-i", "-n", "sh", "-c", cmdStr).Output()
 	if err != nil {
 		// Extract stderr for better debugging if the command actually fails
 		var exitErr *exec.ExitError

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ vcluster connect test -n test -- kubectl get ns`
`65`	`65`	`return cmd.Run(cobraCmd.Context(), args)`
`66`	`66`	`}`
`67`	`67`
`68`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")`
	`68`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")`
`69`	`69`
`70`	`70`	`connect.AddCommonFlags(cobraCmd, &cmd.ConnectOptions)`
`71`	`71`	`connect.AddPlatformFlags(cobraCmd, &cmd.ConnectOptions, "[PLATFORM] ")`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ vcluster create test --namespace test`
`64`	`64`	`},`
`65`	`65`	`}`
`66`	`66`
`67`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")`
	`67`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")`
`68`	`68`
`69`	`69`	`create.AddCommonFlags(cobraCmd, &cmd.CreateOptions)`
`70`	`70`	`create.AddHelmFlags(cobraCmd, &cmd.CreateOptions)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ vcluster delete test --namespace test`
`51`	`51`	`},`
`52`	`52`	`}`
`53`	`53`
`54`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")`
	`54`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")`
`55`	`55`
`56`	`56`	`flagsdelete.AddCommonFlags(cobraCmd, &cmd.DeleteOptions)`
`57`	`57`	`flagsdelete.AddHelmFlags(cobraCmd, &cmd.DeleteOptions)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ vcluster describe -o json test`
`53`	`53`	`}`
`54`	`54`	`p, _ := defaults.Get(pdefaults.KeyProject, "")`
`55`	`55`
`56`		`- cobraCmd.Flags().StringVar(&driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")`
	`56`	`+ cobraCmd.Flags().StringVar(&driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")`
`57`	`57`	`cobraCmd.Flags().StringVarP(&cmd.output, "output", "o", "", "The format to use to display the information, can either be json or yaml")`
`58`	`58`	`cobraCmd.Flags().StringVarP(&cmd.project, "project", "p", p, "The project to use")`
`59`	`59`	`cobraCmd.Flags().BoolVar(&cmd.configOnly, "config-only", false, "Return only the vcluster.yaml configuration")`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ vcluster list --namespace test`
`47`	`47`	`},`
`48`	`48`	`}`
`49`	`49`
`50`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm or platform.")`
	`50`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver to use for managing the virtual cluster, can be either helm, platform, or docker.")`
`51`	`51`	`cobraCmd.Flags().StringVar(&cmd.Output, "output", "table", "Choose the format of the output. [table\|json]")`
`52`	`52`
`53`	`53`	`return cobraCmd`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ vcluster platform login https://my-vcluster-platform.com --access-key myaccesske`
`50`	`50`	`},`
`51`	`51`	`}`
`52`	`52`
`53`		`- loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform and helm")`
	`53`	`+ loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform, helm, and docker")`
`54`	`54`	`loginCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "The access key to use")`
`55`	`55`	`loginCmd.Flags().BoolVar(&cmd.Insecure, "insecure", true, product.Replace("Allow login into an insecure Loft instance"))`
`56`	`56`	`loginCmd.Flags().BoolVar(&cmd.DockerLogin, "docker-login", true, "If true, will log into the docker image registries the user has image pull secrets for")`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ vcluster pause test --namespace test`
`56`	`56`	`},`
`57`	`57`	`}`
`58`	`58`
`59`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm or platform.")`
	`59`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm, platform, or docker.")`
`60`	`60`
`61`	`61`	`// Platform flags`
`62`	`62`	`cobraCmd.Flags().StringVar(&cmd.Project, "project", "", "[PLATFORM] The vCluster platform project to use")`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ vcluster platform login https://my-vcluster-platform.com --access-key myaccesske`
`75`	`75`	`},`
`76`	`76`	`}`
`77`	`77`
`78`		`- loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform and helm")`
	`78`	`+ loginCmd.Flags().StringVar(&cmd.Driver, "use-driver", "", "Switch vCluster driver between platform, helm, and docker")`
`79`	`79`	`loginCmd.Flags().StringVar(&cmd.AccessKey, "access-key", "", "The access key to use")`
`80`	`80`	`loginCmd.Flags().BoolVar(&cmd.Insecure, "insecure", false, product.Replace("Allow login into an insecure Loft instance"))`
`81`	`81`	`loginCmd.Flags().BoolVar(&cmd.DockerLogin, "docker-login", true, "If true, will log into the docker image registries the user has image pull secrets for")`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ vcluster resume test --namespace test`
`52`	`52`	`},`
`53`	`53`	`}`
`54`	`54`
`55`		`- cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm or platform.")`
	`55`	`+ cobraCmd.Flags().StringVar(&cmd.Driver, "driver", "", "The driver for the virtual cluster, can be either helm, platform, or docker.")`
`56`	`56`
`57`	`57`	`// Platform flags`
`58`	`58`	`cobraCmd.Flags().StringVar(&cmd.Project, "project", "", "[PLATFORM] The vCluster platform project to use")`