Skip to content
Snippets Groups Projects
Commit 51a5c00e authored by Tim Kreuzer's avatar Tim Kreuzer
Browse files

add GWDG Staging system

parent 5f16d2a1
Branches
No related tags found
No related merge requests found
Pipeline #269138 passed
...@@ -15,7 +15,7 @@ type: application ...@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # 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. # follow Semantic Versioning. They should reflect the version the application is using.
......
...@@ -78,6 +78,10 @@ data: ...@@ -78,6 +78,10 @@ data:
outpostKubeHLRSStaging: outpostKubeHLRSStaging:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.customConfig.backendServices.outpostKubeGWDGStaging }}
outpostKubeGWDGStaging:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.customConfig.backendServices.outpostKubeLRZ }} {{- with .Values.customConfig.backendServices.outpostKubeLRZ }}
outpostKubeLRZ: outpostKubeLRZ:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
...@@ -154,6 +158,7 @@ data: ...@@ -154,6 +158,7 @@ data:
( has "JSC-Cloud" .Values.customConfig.systems) ( has "JSC-Cloud" .Values.customConfig.systems)
( has "HLRS" .Values.customConfig.systems) ( has "HLRS" .Values.customConfig.systems)
( has "HLRS-Staging" .Values.customConfig.systems) ( has "HLRS-Staging" .Values.customConfig.systems)
( has "GWDG-Staging" .Values.customConfig.systems)
( has "LRZ-Staging" .Values.customConfig.systems) ( has "LRZ-Staging" .Values.customConfig.systems)
( has "LRZ" .Values.customConfig.systems) ( has "LRZ" .Values.customConfig.systems)
( has "MPCDF" .Values.customConfig.systems ) ( has "MPCDF" .Values.customConfig.systems )
...@@ -170,6 +175,7 @@ data: ...@@ -170,6 +175,7 @@ data:
( has "JSC-Cloud" .Values.customConfig.systems ) ( has "JSC-Cloud" .Values.customConfig.systems )
( has "HLRS" .Values.customConfig.systems ) ( has "HLRS" .Values.customConfig.systems )
( has "HLRS-Staging" .Values.customConfig.systems ) ( has "HLRS-Staging" .Values.customConfig.systems )
( has "GWDG-Staging" .Values.customConfig.systems )
( has "LRZ" .Values.customConfig.systems) ( has "LRZ" .Values.customConfig.systems)
( has "LRZ-Staging" .Values.customConfig.systems) ( has "LRZ-Staging" .Values.customConfig.systems)
( has "MPCDF" .Values.customConfig.systems ) ( has "MPCDF" .Values.customConfig.systems )
...@@ -383,6 +389,7 @@ data: ...@@ -383,6 +389,7 @@ data:
(has "JUDAC" .Values.customConfig.systems) (has "JUDAC" .Values.customConfig.systems)
(has "HLRS" .Values.customConfig.systems) (has "HLRS" .Values.customConfig.systems)
(has "HLRS-Staging" .Values.customConfig.systems) (has "HLRS-Staging" .Values.customConfig.systems)
(has "GWDG-Staging" .Values.customConfig.systems)
(has "JSC-Cloud" .Values.customConfig.systems) (has "JSC-Cloud" .Values.customConfig.systems)
(has "LRZ" .Values.customConfig.systems) (has "LRZ" .Values.customConfig.systems)
(has "LRZ-Staging" .Values.customConfig.systems) (has "LRZ-Staging" .Values.customConfig.systems)
...@@ -527,6 +534,15 @@ data: ...@@ -527,6 +534,15 @@ data:
{{- end }} {{- end }}
backendService: outpostKubeTUDStaging backendService: outpostKubeTUDStaging
{{- end }} {{- 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 }} {{- if has "LocalDummy" .Values.customConfig.systems }}
LocalDummy: LocalDummy:
weight: 90 weight: 90
......
...@@ -144,6 +144,8 @@ customConfig: ...@@ -144,6 +144,8 @@ customConfig:
default: 2 default: 2
HLRS-Staging: HLRS-Staging:
default: 2 default: 2
GWDG-Staging:
default: 3
LRZ: LRZ:
default: 5 default: 5
LRZ-Staging: LRZ-Staging:
...@@ -195,6 +197,20 @@ customConfig: ...@@ -195,6 +197,20 @@ customConfig:
request_timeout: 300 request_timeout: 300
urls: urls:
services: http://outpost-kube.outpost.svc:8080/services 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: outpostKubeHLRS:
flavorsRequired: true flavorsRequired: true
userflavors: true userflavors: true
...@@ -389,6 +405,7 @@ customConfig: ...@@ -389,6 +405,7 @@ customConfig:
- LRZ-Staging - LRZ-Staging
- HLRS - HLRS
- HLRS-Staging - HLRS-Staging
- GWDG-Staging
- MPCDF - MPCDF
- TUD - TUD
- TUD-Staging - TUD-Staging
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment