From 429f9902cc973811f2009bd3a6196000d9e70820 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 28 Feb 2024 22:38:09 +0100 Subject: [PATCH 1/2] basehub: add comment to prevent an issue from arising --- helm-charts/basehub/values.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index dde5aa20ba..888f1e2fd8 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -69,6 +69,14 @@ jupyterhub: singleuserAdmin: extraEnv: {} extraVolumeMounts: + # IMPORTANT: What is added to this list is copied to other locations + # that wants to add an element to this list. This is done + # because when Helm config files are merged, lists get + # replaced rather than appended. So, if this is to be + # updated, we should update all those copies as well. An easy + # to way find such copies is to search for "singleuserAdmin:" + # in this repo. + # - name: home mountPath: /home/jovyan/shared-readwrite subPath: _shared From e960441a65405406db7d9339ed0fdec8df975610 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 28 Feb 2024 22:52:24 +0100 Subject: [PATCH 2/2] basehub: clarify why we don't need to chown shared-readwrite --- helm-charts/basehub/values.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 888f1e2fd8..0a0679d1b6 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -222,6 +222,18 @@ jupyterhub: singleuser: # Need to explicitly fix ownership here, as otherwise these directories will be owned # by root on most NFS filesystems - neither EFS nor Google Filestore support anonuid + # + # This has to be done _once_ for each directory we mount _from_ the NFS + # server. We do it all the time since we don't know for sure it has been done once + # already. + # + # Note that we don't have to chown both the shared and shared-readwrite + # folder since they are both mounting the same folder on the NFS server. + # + # For details about this, see notes at: + # - https://github.com/2i2c-org/infrastructure/issues/2953#issuecomment-1672025545 + # - https://github.com/2i2c-org/infrastructure/issues/2946#issuecomment-1671691248 + # initContainers: - name: volume-mount-ownership-fix image: busybox:1.36.1