From 5a7da9393ea4d454a6a5a29b6703e6243309efec Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Fri, 9 Apr 2021 09:19:21 +0000 Subject: [PATCH] [ws-daemon] Remove user namespace variance --- components/ws-daemon/pkg/content/service.go | 4 +--- components/ws-daemon/pkg/internal/session/workspace.go | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/components/ws-daemon/pkg/content/service.go b/components/ws-daemon/pkg/content/service.go index 8c049b95ca4aef..75a7523f452693 100644 --- 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 index bbacc68ed22e93..71d7eab8c88771 100644 --- 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:"-"`