Skip to content

Commit 6499416

Browse files
authored
Remove FUSE support (#18536)
* Remove FUSE support * Update docs * Remove fuse-overlayfs * Fix installer validation
1 parent 820ca18 commit 6499416

File tree

29 files changed

+75
-195
lines changed

29 files changed

+75
-195
lines changed

components/gitpod-protocol/src/wsready.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
// generated using github.com/32leaves/bel on 2023-02-14 09:41:16.808994006 +0000 UTC m=+0.008933200
7+
// generated using github.com/32leaves/bel on 2023-08-17 09:50:49.633992319 +0000 UTC m=+0.007372079
88
// DO NOT MODIFY
99

1010
export enum WorkspaceInitSource {

components/image-builder-api/go/imgbuilder.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/imgbuilder_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/go/mock/mock.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_grpc_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_grpc_pb.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/image-builder-api/typescript/src/imgbuilder_pb.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/local-app-api/go/localapp_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/registry-facade-api/go/imagespec.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/registry-facade-api/go/provider.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/registry-facade-api/go/provider_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/workspacekit/BUILD.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ packages:
1515
config:
1616
packaging: app
1717
buildCommand: ["go", "build", "-ldflags", "-w -extldflags \"-static\" -X 'github.com/gitpod-io/gitpod/workspacekit/cmd.Version=commit-${__git_commit}'"]
18-
- name: fuse-overlayfs
19-
type: generic
20-
config:
21-
commands:
22-
- ["sh", "-c", "curl -o fuse-overlayfs -L https://github.com/containers/fuse-overlayfs/releases/download/v1.7.1/fuse-overlayfs-x86_64 && chmod +x fuse-overlayfs"]
2318
- name: lib
2419
type: go
2520
srcs:
@@ -38,7 +33,6 @@ packages:
3833
type: docker
3934
deps:
4035
- :app
41-
- :fuse-overlayfs
4236
argdeps:
4337
- imageRepoBase
4438
config:

components/workspacekit/cmd/rings.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,6 @@ var ring1Cmd = &cobra.Command{
275275

276276
var mnts []mnte
277277
switch fsshift {
278-
case api.FSShiftMethod_FUSE:
279-
mnts = append(mnts,
280-
mnte{Target: "/", Source: "/.workspace/mark", Flags: unix.MS_BIND | unix.MS_REC},
281-
)
282278
case api.FSShiftMethod_SHIFTFS:
283279
mnts = append(mnts,
284280
mnte{Target: "/", Source: "/.workspace/mark", FSType: "shiftfs"},

components/workspacekit/leeway.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
FROM scratch
66

77
COPY components-workspacekit--app/workspacekit \
8-
components-workspacekit--fuse-overlayfs/fuse-overlayfs \
98
/.supervisor/
109

1110
ARG __GIT_COMMIT

components/ws-daemon-api/go/workspace_daemon.pb.go

Lines changed: 56 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-daemon-api/typescript/src/workspace_daemon_pb.d.ts

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-daemon-api/typescript/src/workspace_daemon_pb.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-daemon-api/workspace_daemon.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ message PrepareForUserNSResponse {
7070
// user namespaced workspaces.
7171
enum FSShiftMethod {
7272
SHIFTFS = 0;
73-
FUSE = 1;
73+
// was used for FUSE
74+
reserved 1;
7475
}
7576

7677
message WriteIDMappingResponse {

components/ws-daemon/nsinsider/main.go

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import (
1010
"net"
1111
"net/netip"
1212
"os"
13-
"os/exec"
14-
"path/filepath"
15-
"strings"
1613
"time"
1714
"unsafe"
1815

@@ -88,74 +85,6 @@ func main() {
8885
return unix.Mount("none", c.String("target"), "", unix.MS_SHARED, "")
8986
},
9087
},
91-
{
92-
Name: "mount-fusefs-mark",
93-
Usage: "mounts a fusefs mark",
94-
Flags: []cli.Flag{
95-
&cli.StringFlag{
96-
Name: "source",
97-
Required: true,
98-
},
99-
&cli.StringFlag{
100-
Name: "merged",
101-
Required: true,
102-
},
103-
&cli.StringFlag{
104-
Name: "upper",
105-
Required: true,
106-
},
107-
&cli.StringFlag{
108-
Name: "work",
109-
Required: true,
110-
},
111-
&cli.StringFlag{
112-
Name: "uidmapping",
113-
Required: false,
114-
},
115-
&cli.StringFlag{
116-
Name: "gidmapping",
117-
Required: false,
118-
},
119-
},
120-
Action: func(c *cli.Context) error {
121-
target := filepath.Clean(c.String("merged"))
122-
upper := filepath.Clean(c.String("upper"))
123-
work := filepath.Clean(c.String("work"))
124-
source := filepath.Clean(c.String("source"))
125-
126-
args := []string{
127-
fmt.Sprintf("lowerdir=%s,upperdir=%v,workdir=%v", source, upper, work),
128-
}
129-
130-
if len(c.String("uidmapping")) > 0 {
131-
args = append(args, fmt.Sprintf("uidmapping=%v", c.String("uidmapping")))
132-
}
133-
134-
if len(c.String("gidmapping")) > 0 {
135-
args = append(args, fmt.Sprintf("gidmapping=%v", c.String("gidmapping")))
136-
}
137-
138-
cmd := exec.Command(
139-
fmt.Sprintf("%v/.supervisor/fuse-overlayfs", source),
140-
"-o",
141-
strings.Join(args, ","),
142-
"none",
143-
target,
144-
)
145-
cmd.Dir = source
146-
147-
out, err := cmd.CombinedOutput()
148-
if err != nil {
149-
return xerrors.Errorf("fuse-overlayfs (%v) failed: %q\n%v",
150-
cmd.Args,
151-
string(out),
152-
err,
153-
)
154-
}
155-
156-
return nil
157-
},
158-
},
15988
{
16089
Name: "mount-shiftfs-mark",
16190
Usage: "mounts a shiftfs mark",

components/ws-daemon/pkg/content/config_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func TestFSShiftMethodUnmarshalJSON(t *testing.T) {
2020
Expectation content.FSShiftMethod
2121
}{
2222
{"shiftfs", content.FSShiftMethod(api.FSShiftMethod_SHIFTFS)},
23-
{"fuse", content.FSShiftMethod(api.FSShiftMethod_FUSE)},
2423
}
2524

2625
for _, test := range tests {

0 commit comments

Comments
 (0)