diff --git a/charts/jupyter-hub-customizations/Chart.yaml b/charts/jupyter-hub-customizations/Chart.yaml index 32f78c2ab31c7a3aba06c42633554186c40235e6..f244001c843b8002a952b52b2b622d64a247d6ee 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.16 +version: 0.16.17 # 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 d4998288765f106e7f2be4d32550a09da48f0be0..b78baad5e9a890304f40f1ee37c64e2993941c77 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 "xpra" "enabled" ) + ( or + (has "JUWELS" .Values.customConfig.systems) + (has "JURECA" .Values.customConfig.systems) + (has "JEDI" .Values.customConfig.systems) + (has "JUSUF" .Values.customConfig.systems) + ) + }} + "xpra": + name: "Xpra (Remote Destkop)" + weight: 50 + allowedLists: + groups: + {{- toYaml (index .Values.customConfig.services.JupyterLab "xpra" "allowedLists" "groups") | nindent 16 }} + systems: + {{- toYaml (index .Values.customConfig.services.JupyterLab "xpra" "allowedLists" "systems") | nindent 16 }} + {{- end }} {{- if and ( index .Values.customConfig.services.JupyterLab "4.3" "enabled" ) ( or @@ -198,6 +216,7 @@ data: (has "JEDI" .Values.customConfig.systems) (has "JUSUF" .Values.customConfig.systems) (has "DEEP" .Values.customConfig.systems) + (has "JSC-Cloud" .Values.customConfig.systems) ) }} "4.3": diff --git a/charts/jupyter-hub-customizations/values.yaml b/charts/jupyter-hub-customizations/values.yaml index d5410e892b3d72f521599e04e0ac0a2ea979cd4b..b80aefeccc78ff71c14b2328bd8b4bba31798254 100644 --- a/charts/jupyter-hub-customizations/values.yaml +++ b/charts/jupyter-hub-customizations/values.yaml @@ -362,6 +362,16 @@ customConfig: - TUD - TUD-Staging - deNBI-Cloud + "xpra": + enabled: true + allowedLists: + groups: + - default + systems: + - JURECA + - JUWELS + - JEDI + - JUSUF "4.3": enabled: true allowedLists: