Update JupyterHub with new AAI, remove GUI templating (testing, devel)

cesnet-central/deployments/fullhub.yaml

@@ -110,9 +110,8 @@ hub:
       url: "http://jwt/"
       display: false
   image:
-    name: valtri/hub
-    tag: "eosc2-exchange"
-    # tag: "eosc-authorize1"
+    name: eginotebooks/hub
+    tag: "sha-323c75e"
   config:
     Authenticator:
       enable_auth_state: true
@@ -130,14 +129,12 @@ hub:
       userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
       client_id: "{{ secret['client_id'] }}"
       client_secret: "{{ secret['client_secret'] }}"
-      oauth_callback_url: "https://fullhub.eosc.zcu.cz/hub/oauth_callback"
+      oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
       openid_configuration_url: "https://proxy.testing.eosc-federation.eu/.well-known/openid-configuration"
       scope: ["openid", "profile", "email", "offline_access", "entitlements"]
       username_claim: "sub"
       extra_authorize_params:
         prompt: consent
-    EOSCNodeAuthenticator:
-      personal_project_re: "^urn:geant:eosc-federation.eu:group:(pp-.*)$"
     JupyterHub:
       admin_access: true
       authenticate_prometheus: false

cesnet-central/inventory/99-all.yaml

@@ -14,6 +14,7 @@ all:
     site_name: cesnet-central
     vault_mount_point: secrets/users/e1662e20-e34b-468c-b0ce-d899bc878364@egi.eu/eosc-dev
 
+    notebooks_hostname: fullhub.eosc.zcu.cz
     binder_hostname: replay.eosc.zcu.cz
     old_binder_hostname: binder.eosc.zcu.cz
     docker2_hostname: registry.eosc.zcu.cz

testing/deployments/hub.yaml

@@ -127,8 +127,8 @@ hub:
       url: "http://jwt/"
       display: false
   image:
-    name: valtri/hub
-    tag: "eosc9-jwt"
+    name: eginotebooks/hub
+    tag: "sha-323c75e"
   config:
     Authenticator:
       enable_auth_state: true
@@ -155,7 +155,7 @@ hub:
     JupyterHub:
       admin_access: true
       authenticate_prometheus: false
-      authenticator_class: egi_notebooks_hub.egiauthenticator.EGICheckinAuthenticator
+      authenticator_class: egi_notebooks_hub.egiauthenticator.EOSCNodeAuthenticator
       # spawner_class: (in egi-notebooks-b2drop)
   extraConfig:
     egi-notebooks-welcome: |-
@@ -163,7 +163,7 @@ hub:
       c.JupyterHub.default_url = "/welcome"
       c.JupyterHub.extra_handlers = [(r'/welcome', WelcomeHandler)]
     egi-notebooks-b2drop: |-
-{% raw %}
+{%- raw %}
       import base64
       import json
       from jinja2 import BaseLoader
@@ -431,28 +431,10 @@ hub:
         </div>
         """
 {% endraw %}
-  templatePaths:
-    - /egi-notebooks-hub/templates
   extraFiles:
-    login.html:
-      mountPath: /egi-notebooks-hub/templates/login.html
+    welcome.html:
+      mountPath: /usr/local/share/jupyterhub/templates/welcome.html
       stringData: |-
-{% raw %}
-        {% extends "egi-login.html" %}
-        {% block main_intro %}
-        <h1><img alt="Notebooks Logo" src="{{ static_url('images/egi-icon-notebooks.svg') }}"
-             height="100">Notebooks</h1>
-        <p>
-        Notebooks is an environment based on <a href="http://jupyter.org/">Jupyter</a> and
-        the <a href="https://www.egi.eu/services/cloud-compute/">EGI cloud service</a> that
-        offers a browser-based, scalable tool for interactive data analysis. The Notebooks
-        environment provides users with notebooks where they can combine text, mathematics,
-        computations and rich media output.
-        </p>
-        <p>
-        Access requires a valid <a href="https://docs.egi.eu/users/check-in/signup">EGI account</a>
-        and <a href="https://docs.egi.eu/users/dev-env/notebooks/#notebooks-for-researchers">
-        enrolling to one of the supported VOs</a>.
-        </p>
-        {% endblock main_intro %}
+{%- raw %}
+        {% extends "login.html" %}
 {% endraw %}