From 8e9f2e18d9f41a4805de6421644b3f7c2c74fbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 7 Nov 2024 15:04:29 +0000
Subject: [PATCH] Update JupyterHub to 4.1.6

---
 cesnet-central/deployments/fullhub.yaml    | 4 +++-
 common/deployments/hub-production.yaml     | 4 +++-
 common/deployments/hub-staging.yaml        | 4 +++-
 common/playbooks/files/jupyterhub-jwt.yaml | 2 +-
 common/playbooks/notebooks.yaml            | 3 ++-
 testing/deployments/hub.yaml               | 4 +++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 47d4748..d0df5cf 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/cesnet-central/deployments/fullhub.yaml
@@ -167,9 +167,11 @@ hub:
       display: false
       api_token: "{{ secrets['zabbix_token'] }}"
   # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
+  # keep k8s-hub version in sync with ../playbooks/notebooks.yaml
   image:
     name: eginotebooks/hub
-    tag: "sha-2fa0db6"
+    # k8s-hub 3.3.8
+    tag: "sha-f5af1a3"
   config:
     Authenticator:
       enable_auth_state: true
diff --git a/common/deployments/hub-production.yaml b/common/deployments/hub-production.yaml
index 759c511..7cadc18 100644
--- a/common/deployments/hub-production.yaml
+++ b/common/deployments/hub-production.yaml
@@ -149,9 +149,11 @@ hub:
       display: false
       api_token: "{{ secrets['zabbix_token'] }}"
   # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
+  # keep k8s-hub version in sync with ../playbooks/notebooks.yaml
   image:
     name: eginotebooks/hub
-    tag: "sha-2fa0db6"
+    # k8s-hub 3.3.8
+    tag: "sha-f5af1a3"
   config:
     Authenticator:
       enable_auth_state: true
diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index 1fd09d7..6ec841e 100644
--- a/common/deployments/hub-staging.yaml
+++ b/common/deployments/hub-staging.yaml
@@ -149,9 +149,11 @@ hub:
       display: false
       api_token: "{{ secrets['zabbix_token'] }}"
   # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
+  # keep k8s-hub version in sync with ../playbooks/notebooks.yaml
   image:
     name: eginotebooks/hub
-    tag: "sha-2fa0db6"
+    # k8s-hub 3.3.8
+    tag: "sha-f5af1a3"
   config:
     Authenticator:
       enable_auth_state: true
diff --git a/common/playbooks/files/jupyterhub-jwt.yaml b/common/playbooks/files/jupyterhub-jwt.yaml
index 98efb15..8eb4a77 100644
--- a/common/playbooks/files/jupyterhub-jwt.yaml
+++ b/common/playbooks/files/jupyterhub-jwt.yaml
@@ -20,7 +20,7 @@ spec:
       containers:
         - name: jwt
           # recommended to keep it in sync with */deployments/*.yaml
-          image: eginotebooks/hub:sha-2fa0db6
+          image: eginotebooks/hub:sha-f5af1a3
           args:
             - fastapi
             - run
diff --git a/common/playbooks/notebooks.yaml b/common/playbooks/notebooks.yaml
index c687395..cc06239 100644
--- a/common/playbooks/notebooks.yaml
+++ b/common/playbooks/notebooks.yaml
@@ -36,7 +36,8 @@
     - name: Deploy/upgrade notebook instance
       vars:
         name: "{{ item | basename | splitext | first }}"
-        version: "3.2.1" # app 4.0.2 (2023-11-27)
+        # keep in sync with ../deployments/*.yaml (original k8s-hub image version)
+        version: "3.3.8" # app 4.1.6 (2024-07-31)
       shell: |-
         helm status --namespace {{ name }} {{ name }}
         if [ $? -ne 0 ]; then
diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml
index 4ece284..b208d2f 100644
--- a/testing/deployments/hub.yaml
+++ b/testing/deployments/hub.yaml
@@ -150,9 +150,11 @@ hub:
       display: false
       api_token: "{{ secrets['zabbix_token'] }}"
   # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
+  # keep k8s-hub version in sync with ../playbooks/notebooks.yaml
   image:
     name: eginotebooks/hub
-    tag: "sha-2fa0db6"
+    # k8s-hub 3.3.8
+    tag: "sha-f5af1a3"
   config:
     Authenticator:
       enable_auth_state: true
-- 
GitLab