From 1747ce40e17e9b4b90a03cdb6eae31fbbe8c159b Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Fri, 5 Sep 2025 20:06:57 +0000 Subject: [PATCH 1/2] fix: remove fuse configmap and add note Signed-off-by: dkwon17 --- .../enabling-fuse-for-all-workspaces.adoc | 47 ++++++++----------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc b/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc index 4f8379ae23..f4114571f2 100644 --- a/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc +++ b/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc @@ -15,34 +15,6 @@ .Procedure -. Create a ConfigMap that mounts the `storage.conf` file for all user workspaces. -+ -==== -[source,yaml,subs="+quotes,+attributes"] ----- -kind: ConfigMap -apiVersion: v1 -metadata: - name: fuse-overlay - namespace: {prod-namespace} - labels: - app.kubernetes.io/part-of: che.eclipse.org - app.kubernetes.io/component: workspaces-config - annotations: - controller.devfile.io/mount-as: subpath - controller.devfile.io/mount-path: /home/user/.config/containers/ -data: - storage.conf: | - [storage] - driver = "overlay" - - [storage.options.overlay] - mount_program="/usr/bin/fuse-overlayfs" ----- -==== -+ -WARNING: Creating this ConfigMap will cause all running workspaces to restart. - . Set the necessary annotation in the `spec.devEnvironments.workspacesPodAnnotations` field of the CheCluster custom resource. + ==== @@ -62,6 +34,25 @@ spec: For OpenShift versions before 4.15, the `io.openshift.podman-fuse: ""` annotation is also required. ==== ++ +[NOTE] +==== +The Universal Development Image (UDI) includes the following logic in the entrypoint script to detect fuse-overlayfs and set the storage driver. +If using a custom image, equivalent logic should be added to the image's entrypoint. + +[bash,subs="verbatim",options="nowrap"] +---- +if [ ! -d "${HOME}/.config/containers" ]; then + mkdir -p ${HOME}/.config/containers + if [ -c "/dev/fuse" ] && [ -f "/usr/bin/fuse-overlayfs" ]; then + (echo '[storage]';echo 'driver = "overlay"';echo '[storage.options.overlay]';echo 'mount_program = "/usr/bin/fuse-overlayfs"') > ${HOME}/.config/containers/storage.conf + else + (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf + fi +fi +---- +==== + .Verification steps . Start a workspace and verify that the storage driver is `overlay`. From 587ce9850dd59304c53df100553edfdb63e880ec Mon Sep 17 00:00:00 2001 From: David Kwon Date: Fri, 5 Sep 2025 17:30:15 -0400 Subject: [PATCH 2/2] Update modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc Co-authored-by: Jana Vrbkova --- .../pages/enabling-fuse-for-all-workspaces.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc b/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc index f4114571f2..7be77ede2f 100644 --- a/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc +++ b/modules/administration-guide/pages/enabling-fuse-for-all-workspaces.adoc @@ -38,7 +38,7 @@ For OpenShift versions before 4.15, the `io.openshift.podman-fuse: ""` annotatio [NOTE] ==== The Universal Development Image (UDI) includes the following logic in the entrypoint script to detect fuse-overlayfs and set the storage driver. -If using a custom image, equivalent logic should be added to the image's entrypoint. +If you use a custom image, you should add an equivalent logic the image's entrypoint. [bash,subs="verbatim",options="nowrap"] ----