From 51a5c00ecd844b303958fddba169213a862515af Mon Sep 17 00:00:00 2001 From: Tim Kreuzer <t.kreuzer@fz-juelich.de> Date: Thu, 24 Apr 2025 16:29:45 +0200 Subject: [PATCH] add GWDG Staging system --- charts/jupyter-hub-customizations/Chart.yaml | 2 +- .../templates/configmap_custom.yaml | 16 ++++++++++++++++ charts/jupyter-hub-customizations/values.yaml | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/charts/jupyter-hub-customizations/Chart.yaml b/charts/jupyter-hub-customizations/Chart.yaml index d8692fb..1558255 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.26 +version: 0.16.27 # 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 1f9813c..c7fd5f6 100644 --- a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml +++ b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml @@ -78,6 +78,10 @@ data: outpostKubeHLRSStaging: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.customConfig.backendServices.outpostKubeGWDGStaging }} + outpostKubeGWDGStaging: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.customConfig.backendServices.outpostKubeLRZ }} outpostKubeLRZ: {{- toYaml . | nindent 8 }} @@ -154,6 +158,7 @@ data: ( has "JSC-Cloud" .Values.customConfig.systems) ( has "HLRS" .Values.customConfig.systems) ( has "HLRS-Staging" .Values.customConfig.systems) + ( has "GWDG-Staging" .Values.customConfig.systems) ( has "LRZ-Staging" .Values.customConfig.systems) ( has "LRZ" .Values.customConfig.systems) ( has "MPCDF" .Values.customConfig.systems ) @@ -170,6 +175,7 @@ data: ( has "JSC-Cloud" .Values.customConfig.systems ) ( has "HLRS" .Values.customConfig.systems ) ( has "HLRS-Staging" .Values.customConfig.systems ) + ( has "GWDG-Staging" .Values.customConfig.systems ) ( has "LRZ" .Values.customConfig.systems) ( has "LRZ-Staging" .Values.customConfig.systems) ( has "MPCDF" .Values.customConfig.systems ) @@ -383,6 +389,7 @@ data: (has "JUDAC" .Values.customConfig.systems) (has "HLRS" .Values.customConfig.systems) (has "HLRS-Staging" .Values.customConfig.systems) + (has "GWDG-Staging" .Values.customConfig.systems) (has "JSC-Cloud" .Values.customConfig.systems) (has "LRZ" .Values.customConfig.systems) (has "LRZ-Staging" .Values.customConfig.systems) @@ -527,6 +534,15 @@ data: {{- end }} backendService: outpostKubeTUDStaging {{- end }} + {{- if has "GWDG-Staging" .Values.customConfig.systems }} + GWDG-Staging: + weight: 15 + {{- with index .Values.customConfig.systemsMaxPerUser "GWDG-Staging" }} + maxPerUser: + {{- toYaml . | nindent 10 }} + {{- end }} + backendService: outpostKubeGWDGStaging + {{- end }} {{- if has "LocalDummy" .Values.customConfig.systems }} LocalDummy: weight: 90 diff --git a/charts/jupyter-hub-customizations/values.yaml b/charts/jupyter-hub-customizations/values.yaml index 3d25134..0a12314 100644 --- a/charts/jupyter-hub-customizations/values.yaml +++ b/charts/jupyter-hub-customizations/values.yaml @@ -144,6 +144,8 @@ customConfig: default: 2 HLRS-Staging: default: 2 + GWDG-Staging: + default: 3 LRZ: default: 5 LRZ-Staging: @@ -195,6 +197,20 @@ customConfig: request_timeout: 300 urls: services: http://outpost-kube.outpost.svc:8080/services + outpostKubeGWDGStaging: + flavorsRequired: true + userflavors: true + userflavorsRequestKwargs: + request_timeout: 2 + poll: true + pollInterval: 30 + pollIntervalRandomizer: 10 + type: kube + mapping: gwdgstaging + requestKwargs: + request_timeout: 300 + urls: + services: https://jupyter-cloud-test.gwdg.de/outpost/services outpostKubeHLRS: flavorsRequired: true userflavors: true @@ -389,6 +405,7 @@ customConfig: - LRZ-Staging - HLRS - HLRS-Staging + - GWDG-Staging - MPCDF - TUD - TUD-Staging -- GitLab