Merge pull request #7143 from GeorgianaElena/bnext-bio

[bnext-bio] group-shared directories

Author: GeorgianaElena

config/clusters/bnext-bio/common.values.yaml

@@ -48,6 +48,10 @@ jupyterhub:
         allowed_organizations:
         - 2i2c-org:hub-access-for-2i2c-staff
         - nucleus-eng:hub-access
+        - nucleus-eng:nucleus-eng-hub-access
+        - nucleus-eng:devcells-all-nodes
+        - nucleus-eng:devcells-chicago-node
+        - nucleus-eng:devcells-london-node
       Authenticator:
         admin_users:
         - antonjs
@@ -59,6 +63,92 @@ jupyterhub:
         - servers!server
         - read:users:name
         - list:users
+    extraConfig:
+      000-volumes-and-volume-mounts-as-dict: |
+        # The base jupyterhub config in zero-to-jupyterhub defines
+        # volumes and volume_mounts as lists.
+        # But we can't add new volumes or volume_mounts to the list
+        # as that replaces the entire list.
+        # So we convert them to dictionaries, which allows us to
+        # add new volumes and volume_mounts as needed.
+        if isinstance(c.KubeSpawner.volumes, list):
+          existing_volumes = c.KubeSpawner.volumes
+          c.KubeSpawner.volumes = {}
+          for volume in existing_volumes:
+            c.KubeSpawner.volumes[volume["name"]] = volume
+        if isinstance(c.KubeSpawner.volume_mounts, list):
+          existing_volume_mounts = c.KubeSpawner.volume_mounts
+          c.KubeSpawner.volume_mounts = {}
+          for idx, volume_mount in enumerate(existing_volume_mounts):
+            c.KubeSpawner.volume_mounts[f"{idx}-{volume_mount['name']}"] = volume_mount
+      001-group-shared-directories: |
+        c.KubeSpawner.group_overrides = {
+          "00-group-hub-access-for-2i2c-staff": {
+            "groups": ["2i2c-org:hub-access-for-2i2c-staff"],
+            "spawner_override": {
+              "volume_mounts": {
+                "00-group-hub-access-for-2i2c-staff": {
+                  "name": "home",
+                  "mountPath": "/home/jovyan/shared-group-projects/hub-access-for-2i2c-staff",
+                  "subPath": "_shared-group-projects/hub-access-for-2i2c-staff",
+                  "readOnly": False
+                },
+              }
+            },
+          },
+          "01-group-nucleus-hub-access": {
+            "groups": ["nucleus-eng:nucleus-eng-hub-access"],
+            "spawner_override": {
+              "volume_mounts": {
+                "00-group-hub-access-for-nucleus-eng-hub-access": {
+                  "name": "home",
+                  "mountPath": "/home/jovyan/shared-group-projects/nucleus-eng-hub-access",
+                  "subPath": "_shared-group-projects/nucleus-eng-hub-access",
+                  "readOnly": False
+                },
+              }
+            },
+          },
+          "02-group-nucleus-devcells-london-node": {
+            "groups": ["nucleus-eng:devcells-london-node"],
+            "spawner_override": {
+              "volume_mounts": {
+                "00-group-hub-access-for-devcells-london-node": {
+                  "name": "home",
+                  "mountPath": "/home/jovyan/shared-group-projects/devcells-london-node",
+                  "subPath": "_shared-group-projects/devcells-london-node",
+                  "readOnly": False
+                },
+              }
+            },
+          },
+          "03-group-nucleus-devcells-chicago-node": {
+            "groups": ["nucleus-eng:devcells-chicago-node"],
+            "spawner_override": {
+              "volume_mounts": {
+                "00-group-hub-access-for-devcells-chicago-node": {
+                  "name": "home",
+                  "mountPath": "/home/jovyan/shared-group-projects/devcells-chicago-node",
+                  "subPath": "_shared-group-projects/devcells-chicago-node",
+                  "readOnly": False
+                },
+              }
+            },
+          },
+          "04-group-nucleus-devcells-all-nodes": {
+            "groups": ["nucleus-eng:devcells-all-nodes"],
+            "spawner_override": {
+              "volume_mounts": {
+                "00-group-hub-access-for-devcells-all-nodes": {
+                  "name": "home",
+                  "mountPath": "/home/jovyan/shared-group-projects/devcells-all-nodes",
+                  "subPath": "_shared-group-projects/devcells-all-nodes",
+                  "readOnly": False
+                },
+              }
+            },
+          },
+        }
   scheduling:
     userScheduler:
       enabled: true