Ensure users keep their nfs home directories with kubespawner 7

2i2c-org · Oct 18, 2024 · 9e1e9e1 · 9e1e9e1
1 parent 9fcba98
commit 9e1e9e1
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 24 deletions.
diff --git a/config/clusters/2i2c-aws-us/itcoocean.values.yaml b/config/clusters/2i2c-aws-us/itcoocean.values.yaml
@@ -73,7 +73,7 @@ jupyterhub:
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
-            subPath: "{username}"
+            subPath: "{escaped_username}"
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home

diff --git a/config/clusters/hhmi/daskhub-common.values.yaml b/config/clusters/hhmi/daskhub-common.values.yaml
@@ -82,7 +82,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home

diff --git a/config/clusters/jupyter-meets-the-earth/daskhub-common.values.yaml b/config/clusters/jupyter-meets-the-earth/daskhub-common.values.yaml
@@ -76,7 +76,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             - name: home
               mountPath: /home/jovyan/shared
               subPath: _shared

diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml
@@ -107,7 +107,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home

diff --git a/config/clusters/nasa-esdis/common.values.yaml b/config/clusters/nasa-esdis/common.values.yaml
@@ -76,7 +76,7 @@ jupyterhub:
               volumeMounts:
                 - name: home
                   mountPath: /home/jovyan
-                  subPath: "{username}"
+                  subPath: "{escaped_username}"
                 # mounted without readonly attribute here,
                 # so we can chown it appropriately
                 - name: home
@@ -93,7 +93,7 @@ jupyterhub:
               volumeMounts:
                 - name: home
                   mountPath: /home/jovyan
-                  subPath: "{username}"
+                  subPath: "{escaped_username}"
               securityContext:
                 runAsUser: 1000
                 runAsGroup: 1000

diff --git a/config/clusters/nasa-esdis/staging.values.yaml b/config/clusters/nasa-esdis/staging.values.yaml
@@ -36,7 +36,7 @@ jupyterhub:
                       volumeMounts:
                         - name: home
                           mountPath: /home/jovyan
-                          subPath: "{username}"
+                          subPath: "{escaped_username}"
                         # mounted without readonly attribute here,
                         # so we can chown it appropriately
                         - name: home
@@ -53,7 +53,7 @@ jupyterhub:
                       volumeMounts:
                         - name: home
                           mountPath: /home/jovyan
-                          subPath: "{username}"
+                          subPath: "{escaped_username}"
                       securityContext:
                         runAsUser: 1000
                         runAsGroup: 1000

diff --git a/config/clusters/nasa-ghg/common.values.yaml b/config/clusters/nasa-ghg/common.values.yaml
@@ -101,7 +101,7 @@ basehub:
                 volumeMounts:
                   - name: home
                     mountPath: /home/jovyan
-                    subPath: "{username}"
+                    subPath: "{escaped_username}"
                   # mounted without readonly attribute here,
                   # so we can chown it appropriately
                   - name: home
@@ -119,7 +119,7 @@ basehub:
                 volumeMounts:
                   - name: home
                     mountPath: /home/jovyan
-                    subPath: "{username}"
+                    subPath: "{escaped_username}"
                 securityContext:
                   runAsUser: 1000
                   runAsGroup: 1000

diff --git a/config/clusters/nasa-ghg/staging.values.yaml b/config/clusters/nasa-ghg/staging.values.yaml
@@ -69,7 +69,7 @@ basehub:
                         volumeMounts:
                           - name: home
                             mountPath: /home/jovyan
-                            subPath: "{username}"
+                            subPath: "{escaped_username}"
                           # mounted without readonly attribute here,
                           # so we can chown it appropriately
                           - name: home
@@ -87,7 +87,7 @@ basehub:
                         volumeMounts:
                           - name: home
                             mountPath: /home/jovyan
-                            subPath: "{username}"
+                            subPath: "{escaped_username}"
                         securityContext:
                           runAsUser: 1000
                           runAsGroup: 1000

diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -98,7 +98,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home
@@ -158,7 +158,7 @@ basehub:
                         volumeMounts:
                           - name: home
                             mountPath: /home/jovyan
-                            subPath: "{username}"
+                            subPath: "{escaped_username}"
                         securityContext:
                           runAsUser: 1000
                           runAsGroup: 1000

diff --git a/config/clusters/nasa-veda/staging.values.yaml b/config/clusters/nasa-veda/staging.values.yaml
@@ -22,7 +22,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home
@@ -68,7 +68,7 @@ basehub:
                         volumeMounts:
                           - name: home
                             mountPath: /home/jovyan
-                            subPath: "{username}"
+                            subPath: "{escaped_username}"
                         securityContext:
                           runAsUser: 1000
                           runAsGroup: 1000

diff --git a/config/clusters/pchub/common.values.yaml b/config/clusters/pchub/common.values.yaml
@@ -66,7 +66,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
             # Mounted without readonly attribute here,
             # so we can chown it appropriately
             - name: home
@@ -84,7 +84,7 @@ basehub:
           volumeMounts:
             - name: home
               mountPath: /home/jovyan
-              subPath: "{username}"
+              subPath: "{escaped_username}"
           securityContext:
             runAsUser: 1000
             runAsGroup: 1000

diff --git a/docs/howto/features/per-user-db.md b/docs/howto/features/per-user-db.md
@@ -68,7 +68,7 @@ jupyterhub:
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
-            subPath: "{username}"
+            subPath: "{escaped_username}"
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
@@ -132,7 +132,7 @@ jupyterhub:
           # that load data into the db from disk work
           - name: home
             mountPath: /home/jovyan
-            subPath: "{username}"
+            subPath: "{escaped_username}"
           - name: postgres-db
             mountPath: /var/lib/postgresql/data
             # postgres recommends against mounting a volume directly here

diff --git a/docs/topic/infrastructure/storage-layer.md b/docs/topic/infrastructure/storage-layer.md
@@ -149,7 +149,7 @@ jupyterhub:
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
-            subPath: "{username}"
+            subPath: "{escaped_username}"
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home

diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
@@ -552,7 +552,7 @@ jupyterhub:
         volumeMounts:
           - name: home
             mountPath: /home/jovyan
-            subPath: "{username}"
+            subPath: "{escaped_username}"
           # Mounted without readonly attribute here,
           # so we can chown it appropriately
           - name: home
@@ -772,7 +772,7 @@ jupyterhub:
       type: static
       static:
         pvcName: home-nfs
-        subPath: "{username}"
+        subPath: "{escaped_username}"
       extraVolumes:
         - name: dev-shm
           emptyDir:
@@ -797,7 +797,7 @@ jupyterhub:
         # problem by openscapes)
         - name: home
           mountPath: /home/rstudio
-          subPath: "{username}"
+          subPath: "{escaped_username}"
         - name: home
           mountPath: /home/rstudio/shared
           subPath: _shared