Finalize proof-of-concept enterprise gateway deploment

cesnet-central/deployments/central.yaml

@@ -16,12 +16,12 @@ ingress:
       secretName: acme-tls-central
 
 singleuser:
-  # storage:
-  #   capacity: 20Gi
-  #   dynamic:
-  #     pvcNameTemplate: claim-{userid}{servername}
-  #     volumeNameTemplate: vol-{userid}{servername}
-  #     storageAccessModes: ["ReadWriteMany"]
+  storage:
+    capacity: 20Gi
+    dynamic:
+      pvcNameTemplate: claim-{userid}{servername}
+      volumeNameTemplate: vol-{userid}{servername}
+      storageAccessModes: ["ReadWriteMany"]
   lifecycleHooks:
     postStart:
       exec: { "command": ["/bin/sh", "-c", "mkdir -p /home/jovyan/.notebookCheckpoints"] }
@@ -33,14 +33,15 @@ singleuser:
     guarantee: .02
   defaultUrl: "/lab"
   image:
-    name: elyra/nb2kg
-    tag: dev
+    # https://github.com/valtri/egi-notebooks-images/tree/jupyter-4.x/single-user-gateway
+    name: valtri/single-user-gateway
+    tag: "jupyter-4b"
+    # name: elyra/nb2kg
+    # tag: dev
   extraEnv:
-    # KERNEL_USERNAME: jovyan
-    KG_AUTH_TOKEN: "{{ gateways_token['cesnet-mcc'] }}"
-    KG_URL: "https://gateway-cesnet.eosc.zcu.cz"
-    # KG_HTTP_USER: jovyan
     KG_REQUEST_TIMEOUT: "60"
+    JUPYTER_GATEWAY_AUTH_TOKEN: "{{ gateways_token['cesnet-mcc'] }}"
+    JUPYTER_GATEWAY_URL: "https://gateway-cesnet.eosc.zcu.cz"
 
 hub:
   # services:
@@ -87,16 +88,13 @@ hub:
       client_secret: "{{ secret['client_secret'] }}"
       oauth_callback_url: "https://eosc.zcu.cz/hub/oauth_callback"
       scope: ["openid", "profile", "email", "offline_access", "eduperson_scoped_affiliation", "eduperson_entitlement"]
-      username_key: "preferred_username" # 'sub' too long for persistent volumes
+      username_key: "sub"
     JupyterHub:
       admin_access: true
       authenticate_prometheus: false
       authenticator_class: egi_notebooks_hub.egiauthenticator.EGICheckinAuthenticator
-      # spawner_class
+      # spawner_class: kubespawner.KubeSpawner
+      spawner_class: egi_notebooks_hub.egispawner.EGISpawner
       # c.B2DropSpawner.args = ["--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints'"]
-  extraConfig:
-    nb2kg: |-
-      config = '/etc/jupyter/jupyter_notebook_config.py'
-      c.Spawner.cmd = ['jupyter-labhub']
   templatePaths:
     - /egi-notebooks-hub/templates