Adding further updates for Hub 5 upgrade + RTC on testing/devel

eosc-devel/deployments/fullhub.yaml

@@ -50,7 +50,7 @@ singleuser:
               k8s-app: cluster-ingress
   image:
     name: eginotebooks/single-user-eosc
-    tag: "sha-dea4fa2"
+    tag: "sha-7052495"
   profileList:
     - display_name: Small Environment - 2 vCPU / 4 GB RAM (non-collaboratice)
       description: >
@@ -70,6 +70,8 @@ singleuser:
         image: "valtri/single-user:jupyter-4e-collab"
         extra_annotations:
           "egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram"
+        #Removes OIDC token mount in notebooks container
+        mount_secrets_volume: false
     - display_name: Small Environment - 2 vCPU / 4 GB RAM
       description: >
         The notebook environment includes Python, R, Julia and Octave kernels.
@@ -180,7 +182,7 @@ hub:
   image:
     name: eginotebooks/hub
     # k8s-hub 4.0.0
-    tag: "sha-6edf89c"
+    tag: "sha-b20ead2"
   config:
     Authenticator:
       enable_auth_state: true

eosc-testing/deployments/hub.yaml

@@ -51,7 +51,7 @@ singleuser:
               k8s-app: cluster-ingress
   image:
     name: eginotebooks/single-user-eosc
-    tag: "sha-dea4fa2"
+    tag: "sha-7052495"
   profileList:
     - display_name: Small Environment - 2 vCPU / 4 GB RAM
       description: >
@@ -96,6 +96,60 @@ singleuser:
           nvidia.com/gpu: 1
       vo_claims:
         - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
+    #RTC images
+    - display_name: Small Environment - 2 vCPU / 4 GB RAM  (Real-time Collaboration)
+      description: >
+        The notebook environment includes Python, R, Julia and Octave kernels.
+      default: true
+      kubespawner_override:
+        args:
+          - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+        environment:
+          JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
+        extra_annotations:
+          "egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram"
+        #Removes OIDC token mount in notebooks container
+        mount_secrets_volume: false
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:2-vcpu-4-gb-ram:act:ppa
+    - display_name: Medium Environment - 4 vCPU / 8 GB RAM  (Real-time Collaboration)
+      description: >
+        The notebook environment includes Python, R, Julia and Octave kernels.
+      kubespawner_override:
+        args:
+          - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+        environment:
+          JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
+        extra_annotations:
+          "egi.eu/flavor": "medium-environment-4-vcpu-8-gb-ram"
+        cpu_guarantee: 0.4
+        cpu_limit: 4
+        mem_guarantee: 1G
+        mem_limit: 8G
+        mount_secrets_volume: false
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:4-vcpu-8-gb-ram:act:ppa
+    - display_name: Large Environment - 8 vCPU / 16 GB RAM / GPU  (Real-time Collaboration)
+      description: >
+        The notebook environment includes Python, R, Julia and Octave kernels with GPU.
+      kubespawner_override:
+        args:
+          - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+        environment:
+          JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
+        cpu_guarantee: 0.8
+        cpu_limit: 8
+        mem_guarantee: 2G
+        mem_limit: 16G
+        extra_annotations:
+          "egi.eu/flavor": "large-environment-8-vcpu-16-gb-ram-gpu"
+        extra_resource_guarantees:
+          nvidia.com/gpu: 1
+        extra_resource_limits:
+          nvidia.com/gpu: 1
+        mount_secrets_volume: false
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
   cmd: jupyterhub-singleuser-webdav-wrapper
   extraFiles:
     wait-remote-home.sh:
@@ -163,7 +217,7 @@ hub:
   image:
     name: eginotebooks/hub
     # k8s-hub 4.0.0
-    tag: "sha-6edf89c"
+    tag: "sha-b20ead2"
   config:
     Authenticator:
       enable_auth_state: true