Working version of the production demo server

aiidalab · Sep 5, 2024 · 4020368 · 4020368
1 parent c69f901
commit 4020368
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/deploy-to-aks.yml b/.github/workflows/deploy-to-aks.yml
@@ -4,7 +4,7 @@ name: Deploy to AKS
 on:
   push:
     branches:
-      - main
+      - production
       - staging
   workflow_dispatch:
 
@@ -17,7 +17,7 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     # production if is main branch, staging if it is staging branch
-    environment: ${{ github.ref == 'refs/heads/main' && 'production' || 'staging' }}
+    environment: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
         K8S_NAMESPACE: ${{ vars.K8S_NAMESPACE }}
 
     - name: Connect to AKS
-      run: az aks get-credentials --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} --name ${{ secrets.AZURE_KUBERNETES_CLUSTER }}
+      run: az aks get-credentials --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_KUBERNETES_CLUSTER }}
 
     - name: Deploy to AKS
       run: |

diff --git a/basehub/Chart.yaml b/basehub/Chart.yaml
@@ -5,5 +5,5 @@ name: basehub
 version: 0.1.0
 dependencies:
     - name: jupyterhub
-      version: 3.1.0
+      version: 3.3.8
       repository: https://jupyterhub.github.io/helm-chart/
diff --git a/basehub/files/etc/jupyterhub/templates/login.html b/basehub/files/etc/jupyterhub/templates/login.html
@@ -11,12 +11,6 @@
       <a class="logo" href="https://aiidalab.net" target="_blank">
         <img src="/hub/static/external/aiidalab-wide-logo.png" alt="AiiDAlab" style="max-height:80px;max-width:100%;">
       </a>
-      <a class="logo" href="https://psi.ch" target="_blank" style="padding:20px;">
-        <img src="/hub/static/external/psi-old-logo.svg" alt="PSI" style="max-height:100px;max-width:100%;">
-      </a>
-      <a class="logo" href="https://www.psi.ch/en/lms" target="_blank">
-        Laboratory for Materials Simulations (LMS)
-      </a>
       <a class="logo" href="http://nccr-marvel.ch/" target="_blank">
         <img class="sponsor" src="/hub/static/external/marvel-cropped-logo.png" alt="NCCR MARVEL" style="max-height:100px;max-width:100%">
       </a>
@@ -54,12 +48,15 @@ <h3 align="center">Login to AiiDAlab</h3>
   {% endblock login %}
 
   <div class="container col-sm-7">
-    <h1>Welcome to the AiiDAlab deployment for PSI staff!</h1>
-    <p>This AiiDAlab server is deployed and maintained by the <a href="https://www.psi.ch/en/lms/msd-group" target="_blank">Materials Software and Data Group (MSD)</a> and its aim is to serve PSI staff in facilitating the execution and analysis of DFT simulations.</p>
+    <h1>Welcome to the AiiDAlab demo server!</h1>
+    <p> This AiiDAlab server is deployed and maintained by the <a href="https://www.aiidalab.net/about/" target="_blank">AiiDAlab team</a>.</p>
+    <p> The goal of the server is to provide a platform for users to try out AiiDAlab without the need to install it locally.</p>
+    <p> The server is not intended for production use, and the data on the server may be deleted at any time without notice. </p>
 
     <h2>Login to AiiDAlab</h2>
     <p>
-      The service is available to all PSI staff. Please login with your PSI account.
+      The service is available to anyone with GitHub credentials.
+      Click the "Sign in with GitHub" button to login.
     </p>
 
     <h2 id="gettingstartedwithaiidalab">Getting started with AiiDAlab</h2>

diff --git a/basehub/values.yaml.j2 b/basehub/values.yaml.j2
@@ -1,8 +1,6 @@
 ---
 jupyterhub:
     proxy:
-        service:
-          loadBalancerIP: 20.250.195.79
         https:
             enabled: true
             hosts:
@@ -12,20 +10,22 @@ jupyterhub:
     singleuser:
         image:
             name: ghcr.io/aiidalab/qe
-            tag: pr-781
+            tag: edge
             pullPolicy: Always
         cmd:
             - start-singleuser.sh
         extraEnv:
             JUPYTERHUB_SINGLEUSER_APP: notebook.notebookapp.NotebookApp
         cpu:
-            guarantee: 1
-            limit: 2
+            guarantee: 1.5
+            limit: 1.5
         memory:
-            guarantee: 4G
-            limit: 8G
+            guarantee: 5G
+            limit: 5G
         storage:
-            type: none  # user don't have persistent storage, the data will be lost after the pod is deleted
+            homeMountPath: /home/jovyan
+            dynamic:
+                storageClass: default
             extraVolumes:
                 - name: hub-templates
                   configMap:
@@ -43,20 +43,24 @@ jupyterhub:
                   name: hub-external
                 - mountPath: /etc/jupyter
                   name: etc-jupyter
-        profileList:
-            # A potential issue that profiles share the same PVC
-            # using multiple storageClass can solve this issue, but we do not
-            # need to do this for now.
-            - display_name: Quantum ESPRESSO App image
-              description: Ready to run Quantum ESPRESSO app.
-              default: true
-            - display_name: AiiDA in JupyterLab
-              description: AiiDA in JupyterHub for tutorials.
-              kubespawner_override:
-                  image: ghcr.io/aiidalab/base-with-services:2024.1020
-                  default_url: /lab
-                  environment:
-                      JUPYTERHUB_SINGLEUSER_APP: jupyter_server.serverapp.ServerApp
+        # profileList:
+        #     # A potential issue that profiles share the same PVC
+        #     # using multiple storageClass can solve this issue, but we do not
+        #     # need to do this for now.
+        #     - display_name: Quantum ESPRESSO App image
+        #       description: Ready to run Quantum ESPRESSO app.
+        #       default: true
+        #     - display_name: Minimal bare AiiDAlab image
+        #       description: If you want have a bare AiiDAlab and install you own app from store.
+        #       kubespawner_override:
+        #           image: ghcr.io/aiidalab/full-stack:v2023.1014
+        #     - display_name: AiiDA in JupyterLab
+        #       description: JupyterLab with AiiDA installed for tutorials.
+        #       kubespawner_override:
+        #           image: ghcr.io/aiidalab/base-with-services:v2023.1014
+        #           default_url: /lab
+        #           environment:
+        #               JUPYTERHUB_SINGLEUSER_APP: jupyter_server.serverapp.ServerApp
     hub:
         db:
             pvc:
@@ -108,7 +112,8 @@ jupyterhub:
                 client_id: {{ environ('OAUTH_CLIENT_ID') }}
                 client_secret: {{ environ('OAUTH_CLIENT_SECRET') }}
                 oauth_callback_url: {{ environ('OAUTH_CALLBACK_URL') }}
-                allowed_organizations: ['aiidalab']
+                allow_all: true
+                #allowed_organizations: ['aiidalab']
                 admin_users:
                     - unkcpz
                     - yakutovicha