Skip to content

Commit fab72bc

Browse files
jentingroboquat
authored andcommitted
Revert "[supervisor] fix chown of /workspace when using PVC"
This reverts commit 370ba5e.
1 parent 3eb1ba5 commit fab72bc

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

components/supervisor/pkg/supervisor/supervisor.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -1325,11 +1325,9 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
13251325

13261326
fn := "/workspace/.gitpod/content.json"
13271327
fnReady := "/workspace/.gitpod/ready"
1328-
doChown := true
13291328
if _, err := os.Stat("/.workspace/.gitpod/content.json"); !os.IsNotExist(err) {
13301329
fn = "/.workspace/.gitpod/content.json"
13311330
fnReady = "/.workspace/.gitpod/ready"
1332-
doChown = false // cannot chown when using PVC as it is owned by 133332 user
13331331
log.Info("Detected content.json in /.workspace folder, assuming PVC feature enabled")
13341332
}
13351333

@@ -1378,7 +1376,7 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
13781376

13791377
log.Info("supervisor: running content service executor with content descriptor")
13801378
var src csapi.WorkspaceInitSource
1381-
src, err = executor.Execute(ctx, "/workspace", contentFile, doChown)
1379+
src, err = executor.Execute(ctx, "/workspace", contentFile, true)
13821380
if err != nil {
13831381
return
13841382
}

0 commit comments

Comments
 (0)