Cherry pick 3.18 udi fixes to devspaces-3-rhel-9 (#729)

* Update UDI to automatically detect fuse and for podman 5 support

Fixes are from devfile/developer-images/pull/198 and devfile/developer-images/pull/209

Signed-off-by: David Kwon <[email protected]>

* Update .stow-local-ignore with files in /home/user that would break running stow

Fix from devfile/developer-images/pull/196

Signed-off-by: David Kwon <[email protected]>

* Update virtualenv to 20.28.0

Signed-off-by: David Kwon <[email protected]>

* Fix UDI build (#709)

* Undo 9a57bfc
* Update virtualenv to 20.28.0 in requirements-build.in and run pip-compile
* Update hatch-vcs, hatchling, packaging, and all calver
* Move && to previous line

Signed-off-by: David Kwon <[email protected]>

---------

Signed-off-by: David Kwon <[email protected]>

Author: dkwon17

devspaces-udi/Dockerfile

@@ -220,11 +220,7 @@ RUN \
     mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; \
     touch /var/lib/shared/overlay-images/images.lock; \
     touch /var/lib/shared/overlay-layers/layers.lock && \
-    ## Rootless podman install #5: but use VFS since we were not able to make Fuse work yet...
-    # TODO switch this to fuse in OCP 4.12?
-    mkdir -p "${HOME}"/.config/containers && \
-    (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf && \
-    ## Rootless podman install #6: rename podman to allow the execution of 'podman run' using
+    ## Rootless podman install #5: rename podman to allow the execution of 'podman run' using
     ##                             kubedock but 'podman build' using podman.orig
     mv /usr/bin/podman /usr/bin/podman.orig && \
     # Docker alias

devspaces-udi/build/python/requirements-build.in

@@ -4,14 +4,15 @@
 # for python lang server + yq
 argcomplete==2.0.0
 attrs==22.1.0
+calver==2022.6.26
 Cython==0.29.32
 exceptiongroup==1.0.1
 flit_scm==1.7.0
 flit_core==3.8.0
-hatch-vcs>=0.2
-hatchling>=1.11.1
+hatch-vcs>=0.3
+hatchling==1.25
 iniconfig==1.1.1
-packaging==21.3
+packaging==23.2
 pip==23.0.1
 pluggy==1.0.0
 pyparsing==3.0.9
@@ -23,7 +24,7 @@ six==1.16.0
 toml==0.10.2
 tomli==2.0.1
 typing_extensions==4.4.0
-virtualenv
+virtualenv==20.28.0
 xmltodict==0.13.0
 wheel
 yq==3.1.0

devspaces-udi/build/python/requirements-build.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile --allow-unsafe --output-file=requirements-build.txt requirements-build.in
 #
@@ -12,17 +12,15 @@ attrs==22.1.0
     # via
     #   -r requirements-build.in
     #   pytest
+calver==2022.6.26
+    # via -r requirements-build.in
 cython==0.29.32
     # via -r requirements-build.in
-distlib==0.3.6
+distlib==0.3.9
     # via virtualenv
-editables==0.3
-    # via hatchling
 exceptiongroup==1.0.1
-    # via
-    #   -r requirements-build.in
-    #   pytest
-filelock==3.8.2
+    # via -r requirements-build.in
+filelock==3.16.1
     # via virtualenv
 flake8==6.0.0
     # via -r requirements-build.in
@@ -32,9 +30,9 @@ flit-core==3.8.0
     #   flit-scm
 flit-scm==1.7.0
     # via -r requirements-build.in
-hatch-vcs==0.2.1
+hatch-vcs==0.4.0
     # via -r requirements-build.in
-hatchling==1.11.1
+hatchling==1.25.0
     # via
     #   -r requirements-build.in
     #   hatch-vcs
@@ -46,15 +44,15 @@ mccabe==0.7.0
     # via
     #   -r requirements-build.in
     #   flake8
-packaging==21.3
+packaging==23.2
     # via
     #   -r requirements-build.in
     #   hatchling
     #   pytest
     #   setuptools-scm
-pathspec==0.10.2
+pathspec==0.12.1
     # via hatchling
-platformdirs==2.6.0
+platformdirs==4.3.6
     # via virtualenv
 pluggy==1.0.0
     # via
@@ -70,9 +68,7 @@ pyflakes==3.0.1
     #   -r requirements-build.in
     #   flake8
 pyparsing==3.0.9
-    # via
-    #   -r requirements-build.in
-    #   packaging
+    # via -r requirements-build.in
 pytest==7.2.0
     # via -r requirements-build.in
 pyyaml==6.0
@@ -93,15 +89,14 @@ toml==0.10.2
 tomli==2.0.1
     # via
     #   -r requirements-build.in
-    #   flit-scm
-    #   hatchling
-    #   pytest
     #   setuptools-scm
+trove-classifiers==2025.1.7.14
+    # via hatchling
 typing-extensions==4.4.0
     # via
     #   -r requirements-build.in
     #   setuptools-scm
-virtualenv==20.17.1
+virtualenv==20.28.0
     # via -r requirements-build.in
 wheel==0.38.4
     # via -r requirements-build.in

devspaces-udi/etc/.stow-local-ignore

@@ -5,3 +5,6 @@
 # but we don't want them to be symbolic links (or to cause stow conflicts). They will be copied to /home/user/ manually.
 \.bashrc
 \.bash_profile
+
+# Ignore files under .config directory
+\.config

devspaces-udi/etc/entrypoint.sh

@@ -118,6 +118,16 @@ else
     ln -f -s /usr/bin/podman.orig /home/tooling/.local/bin/podman
 fi
 
+# Configure container builds to use vfs or fuse-overlayfs
+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
+
 #############################################################################
 # Stow: If persistUserHome is enabled, then the contents of /home/user/
 # will be mounted by a PVC and overwritten. In this case, we use stow to
@@ -135,6 +145,32 @@ mountpoint -q /home/user/ || HOME_USER_MOUNTED=$?
 STOW_COMPLETE=/home/user/.stow_completed
 
 if [ $HOME_USER_MOUNTED -eq 0 ] && [ ! -f $STOW_COMPLETE ]; then
+    # There may be regular, non-symlink files in /home/user that match the
+    # pathing of files in /home/tooling. Stow will error out when it tries to
+    # stow on top of that. Instead, we can append to the current
+    # /home/tooling/.stow-local-ignore file to ignore pre-existing,
+    # non-symlinked files in /home/user that match those in /home/tooling before
+    # we run stow.
+    #
+    # Create two text files containing a sorted path-based list of files in
+    # /home/tooling and /home/user. Cut off "/home/user" and "/home/tooling" and
+    # only get the sub-paths so we can do a proper comparison
+    #
+    # In the case of /home/user, we want regular file types and not symbolic
+    # links.
+    find /home/user -type f -xtype f -print  | sort | sed 's|/home/user||g' > /tmp/user.txt
+    find /home/tooling -print | sort | sed 's|/home/tooling||g' > /tmp/tooling.txt
+    # We compare the two files, trying to find files that exist in /home/user
+    # and /home/tooling. Being that the files that get flagged here are not
+    # already synlinks, we will want to ignore them.
+    IGNORE_FILES="$(comm -12 /tmp/user.txt /tmp/tooling.txt)"
+    # We no longer require the file lists, so remove them
+    rm /tmp/user.txt /tmp/tooling.txt
+    # For each file we need to ignore, append them to
+    # /home/tooling/.stow-local-ignore.
+    for f in $IGNORE_FILES; do echo "${f}" >> /home/tooling/.stow-local-ignore;done
+    # We are now ready to run stow
+    #
     # Create symbolic links from /home/tooling/ -> /home/user/
     stow . -t /home/user/ -d /home/tooling/ --no-folding -v 2 > /tmp/stow.log 2>&1
     # Vim does not permit .viminfo to be a symbolic link for security reasons, so manually copy it