Merge pull request 2i2c-org#4146 from yuvipanda/veda-allusers

nasa-veda: Add 'shared-public' to hubs
sgibson91 · May 29, 2024 · 301a371 · 301a371
2 parents 392deda + b345a4d
commit 301a371
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 17 deletions.
diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -62,6 +62,42 @@ basehub:
             - wildintellect
     singleuser:
       defaultUrl: /lab
+      initContainers:
+        - &volume_ownership_fix_initcontainer
+          name: volume-mount-ownership-fix
+          image: busybox:1.36.1
+          command:
+            - sh
+            - -c
+            - id && chown 1000:1000 /home/jovyan /home/jovyan/shared /home/jovyan/shared-public && ls -lhd /home/jovyan
+          securityContext:
+            runAsUser: 0
+          volumeMounts:
+            - name: home
+              mountPath: /home/jovyan
+              subPath: "{username}"
+            # Mounted without readonly attribute here,
+            # so we can chown it appropriately
+            - name: home
+              mountPath: /home/jovyan/shared
+              subPath: _shared
+            - name: home
+              mountPath: /home/jovyan/shared-public
+              subPath: _shared-public
+      storage:
+        extraVolumeMounts:
+          - name: home
+            mountPath: /home/jovyan/shared-public
+            subPath: _shared-public
+            readOnly: false
+          - name: home
+            mountPath: /home/rstudio/shared-public
+            subPath: _shared-public
+            readOnly: false
+          - name: home
+            mountPath: /home/jovyan/shared
+            subPath: _shared
+            readOnly: true
       profileList:
         - display_name: "Modified Pangeo Notebook"
           slug: modified-pangeo
@@ -72,23 +108,7 @@ basehub:
             init_containers:
               # 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
-              - name: volume-mount-ownership-fix
-                image: busybox:1.36.1
-                command:
-                  - sh
-                  - -c
-                  - id && chown 1000:1000 /home/jovyan /home/jovyan/shared && ls -lhd /home/jovyan
-                securityContext:
-                  runAsUser: 0
-                volumeMounts:
-                  - name: home
-                    mountPath: /home/jovyan
-                    subPath: "{username}"
-                  # mounted without readonly attribute here,
-                  # so we can chown it appropriately
-                  - name: home
-                    mountPath: /home/jovyan/shared
-                    subPath: _shared
+              - *volume_ownership_fix_initcontainer
               # this container uses nbgitpuller to mount https://github.com/NASA-IMPACT/veda-docs/ for user pods
               # image source: https://github.com/NASA-IMPACT/jupyterhub-gitpuller-init
               - name: jupyterhub-gitpuller-init

diff --git a/docs/topic/infrastructure/storage-layer.md b/docs/topic/infrastructure/storage-layer.md
@@ -125,6 +125,10 @@ jupyterhub:
           mountPath: /home/jovyan/shared-public
           subPath: _shared-public
           readOnly: false
+        - name: home
+          mountPath: /home/rstudio/shared-public
+          subPath: _shared-public
+          readOnly: false
         - name: home
           mountPath: /home/jovyan/shared
           subPath: _shared