Merge pull request #2954 from consideRatio/pr/fix-shared-readwrite-stuff

basehub: avoid creating empty shared-readwrite directory for non-admins
2i2c-org · Aug 10, 2023 · 51eee06 · 51eee06
2 parents 99694c6 + 6f0a457
commit 51eee06
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/config/clusters/2i2c-aws-us/itcoocean.values.yaml b/config/clusters/2i2c-aws-us/itcoocean.values.yaml
@@ -72,7 +72,7 @@ jupyterhub:
           [
             "sh",
             "-c",
-            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
+            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
           ]
         securityContext:
           runAsUser: 0
@@ -83,7 +83,7 @@ jupyterhub:
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
           - name: home
             mountPath: /home/jovyan/shared-public

diff --git a/config/clusters/2i2c/climatematch.values.yaml b/config/clusters/2i2c/climatematch.values.yaml
@@ -42,7 +42,7 @@ jupyterhub:
           [
             "sh",
             "-c",
-            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
+            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
           ]
         securityContext:
           runAsUser: 0
@@ -53,7 +53,7 @@ jupyterhub:
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
           - name: home
             mountPath: /home/jovyan/shared-public

diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml
@@ -94,7 +94,7 @@ basehub:
             [
               "sh",
               "-c",
-              "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
+              "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
             ]
           securityContext:
             runAsUser: 0
@@ -105,7 +105,7 @@ basehub:
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home
-              mountPath: /home/jovyan/shared-readwrite
+              mountPath: /home/jovyan/shared
               subPath: _shared
             - name: home
               mountPath: /home/jovyan/shared-public

diff --git a/config/clusters/qcl/common.values.yaml b/config/clusters/qcl/common.values.yaml
@@ -234,7 +234,7 @@ jupyterhub:
           [
             "sh",
             "-c",
-            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
+            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
           ]
         securityContext:
           runAsUser: 0
@@ -245,7 +245,7 @@ jupyterhub:
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
           - name: home
             mountPath: /home/jovyan/shared-public

diff --git a/docs/howto/features/per-user-db.md b/docs/howto/features/per-user-db.md
@@ -63,17 +63,18 @@ jupyterhub:
             [
                 "sh",
                 "-c",
-                "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /var/lib/postgresql/data && ls -lhd /home/jovyan ",
+                "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /var/lib/postgresql/data && ls -lhd /home/jovyan ",
             ]
         securityContext:
             runAsUser: 0
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
             subPath: "{username}"
-          # Here so we can chown it appropriately
+          # Mounted without readonly attribute here,
+          # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
           - name: postgres-db
             mountPath: /var/lib/postgresql/data

diff --git a/docs/topic/infrastructure/storage-layer.md b/docs/topic/infrastructure/storage-layer.md
@@ -117,7 +117,7 @@ jupyterhub:
           [
             "sh",
             "-c",
-            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
+            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && chown 1000:1000 /home/jovyan/shared-public && ls -lhd /home/jovyan ",
           ]
         securityContext:
           runAsUser: 0
@@ -128,7 +128,7 @@ jupyterhub:
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
           - name: home
             mountPath: /home/jovyan/shared-public

diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
@@ -177,17 +177,18 @@ jupyterhub:
           [
             "sh",
             "-c",
-            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared-readwrite && ls -lhd /home/jovyan ",
+            "id && chown 1000:1000 /home/jovyan && chown 1000:1000 /home/jovyan/shared && ls -lhd /home/jovyan ",
           ]
         securityContext:
           runAsUser: 0
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
             subPath: "{username}"
-          # Here so we can chown it appropriately
+          # Mounted without readonly attribute here,
+          # so we can chown it appropriately
           - name: home
-            mountPath: /home/jovyan/shared-readwrite
+            mountPath: /home/jovyan/shared
             subPath: _shared
     cmd:
       # Explicitly define this, as it's no longer set by z2jh