From b05620ceac73b2fb3070aa3c992eabcc06b58e2b Mon Sep 17 00:00:00 2001
From: Tim Kreuzer <t.kreuzer@fz-juelich.de>
Date: Fri, 11 Apr 2025 08:28:06 +0200
Subject: [PATCH] Add VSCode as JupyterLab option
---
charts/jupyter-hub-customizations/Chart.yaml | 2 +-
.../templates/configmap_custom.yaml | 18 ++++++++++++++++++
charts/jupyter-hub-customizations/values.yaml | 12 +++++++++++-
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/charts/jupyter-hub-customizations/Chart.yaml b/charts/jupyter-hub-customizations/Chart.yaml
index bdf73fd..4e91baa 100644
--- a/charts/jupyter-hub-customizations/Chart.yaml
+++ b/charts/jupyter-hub-customizations/Chart.yaml
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.16.23
+version: 0.16.24
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
index d94f71b..c80907c 100644
--- a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
+++ b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
@@ -190,6 +190,24 @@ data:
systems:
{{- toYaml .Values.customConfig.services.JupyterLab.default.allowedLists.systems | nindent 16 }}
{{- end }}
+ {{- if and
+ ( index .Values.customConfig.services.JupyterLab "vscode" "enabled" )
+ ( or
+ (has "JUWELS" .Values.customConfig.systems)
+ (has "JURECA" .Values.customConfig.systems)
+ (has "JEDI" .Values.customConfig.systems)
+ (has "JUSUF" .Values.customConfig.systems)
+ )
+ }}
+ "vscode":
+ name: "VSCode"
+ weight: 51
+ allowedLists:
+ groups:
+ {{- toYaml (index .Values.customConfig.services.JupyterLab "vscode" "allowedLists" "groups") | nindent 16 }}
+ systems:
+ {{- toYaml (index .Values.customConfig.services.JupyterLab "vscode" "allowedLists" "systems") | nindent 16 }}
+ {{- end }}
{{- if and
( index .Values.customConfig.services.JupyterLab "xpra" "enabled" )
( or
diff --git a/charts/jupyter-hub-customizations/values.yaml b/charts/jupyter-hub-customizations/values.yaml
index f6161bb..5e56a82 100644
--- a/charts/jupyter-hub-customizations/values.yaml
+++ b/charts/jupyter-hub-customizations/values.yaml
@@ -373,7 +373,7 @@ customConfig:
- "outpost_flavors"
services:
JupyterLab:
- defaultOption: "4.2"
+ defaultOption: "4.3"
allowedGroups:
- default
default:
@@ -391,6 +391,16 @@ customConfig:
- TUD
- TUD-Staging
- deNBI-Cloud
+ "vscode":
+ enabled: false
+ allowedLists:
+ groups:
+ - default
+ systems:
+ - JURECA
+ - JUWELS
+ - JEDI
+ - JUSUF
"xpra":
enabled: true
allowedLists:
--
GitLab