[ws-daemon] Remove user namespace variance

gitpod-io · Apr 9, 2021 · 5a7da93 · 5a7da93
1 parent 055115b
commit 5a7da93
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/components/ws-daemon/pkg/content/service.go b/components/ws-daemon/pkg/content/service.go
@@ -265,7 +265,6 @@ func (s *WorkspaceService) creator(req *api.InitWorkspaceRequest, upperdir strin
 			InstanceID:          req.Id,
 			FullWorkspaceBackup: req.FullWorkspaceBackup,
 			ContentManifest:     req.ContentManifest,
-			UserNamespaced:      true,
 
 			ServiceLocDaemon: filepath.Join(s.config.WorkingArea, req.Id+"-daemon"),
 			ServiceLocNode:   filepath.Join(s.config.WorkingAreaNode, req.Id+"-daemon"),
@@ -480,8 +479,7 @@ func (s *WorkspaceService) uploadWorkspaceContent(ctx context.Context, sess *ses
 		}()
 
 		var opts []archive.TarOption
-		// TODO (aledbf): remove after April release (user namespace is not a feature preview)
-		if !sess.FullWorkspaceBackup && sess.UserNamespaced {
+		if !sess.FullWorkspaceBackup {
 			mappings := []archive.IDMapping{
 				{ContainerID: 0, HostID: wsinit.GitpodUID, Size: 1},
 				{ContainerID: 1, HostID: 100000, Size: 65534},

diff --git a/components/ws-daemon/pkg/internal/session/workspace.go b/components/ws-daemon/pkg/internal/session/workspace.go
@@ -72,8 +72,6 @@ type Workspace struct {
 
 	ServiceLocNode   string `json:"serviceLocNode"`
 	ServiceLocDaemon string `json:"serviceLocDaemon"`
-	// TODO (aledbf): remove after April release (user namespace is not a feature preview)
-	UserNamespaced bool `json:"userNamespaced"`
 
 	NonPersistentAttrs map[string]interface{} `json:"-"`