From aac3ca4ec32c47b2ab44f8d5ce60c667549f7482 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Mon, 31 Jul 2023 07:02:01 -0400
Subject: [PATCH] Upgrade helm chart

Bug: T343116
---
 images/paws-hub/Dockerfile   |  2 +-
 images/singleuser/Dockerfile | 16 +---------------
 paws/Chart.yaml              |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/images/paws-hub/Dockerfile b/images/paws-hub/Dockerfile
index 6730b748..38bf3480 100644
--- a/images/paws-hub/Dockerfile
+++ b/images/paws-hub/Dockerfile
@@ -1,4 +1,4 @@
-FROM jupyterhub/k8s-hub:2.0.0
+FROM jupyterhub/k8s-hub:2.0.0:3.0.0-beta.3.git.6256.hc3c4e121
 ARG NB_USER=tools.paws
 ARG NB_UID=52771
 ARG HOME=/home/paws
diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile
index f6153dbe..1aa7e9a2 100644
--- a/images/singleuser/Dockerfile
+++ b/images/singleuser/Dockerfile
@@ -45,8 +45,7 @@ RUN pip --no-cache-dir install -U pip setuptools wheel
 # Install base notebook packages
 RUN pip install --prefix=/srv/paws --no-cache-dir \
     jupyterhub==4.0.0 \
-    notebook==6.4.12 \
-    jupyterlab==3.4.8
+    jupyterlab==4.0.3
 
 ## End minimal setup ##
 
@@ -262,17 +261,4 @@ COPY banner /etc/bash.bashrc
 # use custom css to hide clusters tab
 COPY --chown=tools.paws:tools.paws hide_clusters_tab.css /home/paws/.jupyter/custom/custom.css
 
-## Install SPARQL
-USER root
-RUN apt-get update && \
-    apt-get install --yes \
-    # For sparql kernel
-    graphviz
-
-USER ${NB_USER}
-RUN pip install --no-cache-dir sparqlkernel
-RUN python3 -m jupyter sparqlkernel install --sys-prefix
-
-## End SPARQL Install
-
 EXPOSE 8888
diff --git a/paws/Chart.yaml b/paws/Chart.yaml
index b6493712..835fc7f5 100644
--- a/paws/Chart.yaml
+++ b/paws/Chart.yaml
@@ -3,8 +3,8 @@
 apiVersion: v2
 description: A Helm chart for PAWS
 name: paws
-version: "2.7"
+version: "2.8"
 dependencies:
   - name: jupyterhub
-    version: "2.0.0"
+    version: "3.0.0-beta.3.git.6259.h5b6e57ed"
     repository: "https://jupyterhub.github.io/helm-chart"