[ws-daemon] mount nfs in workspace network (#20404)

iQQBot · web-flow · commit 55540b30728c · 2024-11-29T15:16:07.000-05:00
diff --git a/components/ws-daemon/pkg/iws/iws.go b/components/ws-daemon/pkg/iws/iws.go
@@ -766,7 +766,7 @@ func (wbs *InWorkspaceServiceServer) MountNfs(ctx context.Context, req *api.Moun
 	}
 
 	log.WithField("source", req.Source).WithField("target", req.Target).WithField("staging", nodeStaging).WithField("args", req.Args).Info("Mounting nfs")
-	cmd := exec.CommandContext(ctx, "mount", "-t", "nfs4", "-o", req.Args, req.Source, nodeStaging)
+	cmd := exec.CommandContext(ctx, "nsenter", "-n", "-t", strconv.Itoa(int(supervisorPID)), "mount", "-t", "nfs4", "-o", req.Args, req.Source, nodeStaging)
 	cmd.Stderr = os.Stderr
 	cmd.Stdin = os.Stdin
 

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ func (wbs InWorkspaceServiceServer) MountNfs(ctx context.Context, req api.Moun`
`766`	`766`	`}`
`767`	`767`
`768`	`768`	`log.WithField("source", req.Source).WithField("target", req.Target).WithField("staging", nodeStaging).WithField("args", req.Args).Info("Mounting nfs")`
`769`		`- cmd := exec.CommandContext(ctx, "mount", "-t", "nfs4", "-o", req.Args, req.Source, nodeStaging)`
	`769`	`+ cmd := exec.CommandContext(ctx, "nsenter", "-n", "-t", strconv.Itoa(int(supervisorPID)), "mount", "-t", "nfs4", "-o", req.Args, req.Source, nodeStaging)`
`770`	`770`	`cmd.Stderr = os.Stderr`
`771`	`771`	`cmd.Stdin = os.Stdin`
`772`	`772`