From 9c93ac5cde8988efef5d966dae30d5ffdbf2d4be Mon Sep 17 00:00:00 2001
From: Tim Kreuzer <t.kreuzer@fz-juelich.de>
Date: Thu, 20 Mar 2025 12:30:20 +0100
Subject: [PATCH] bring jupyterjsc back online
---
jupyterjsc/custom/fleet.yaml | 4 +--
.../z2jh/kustomize-maint/kustomization.yaml | 28 -------------------
.../values/overlays/production/hosts.yaml | 8 +++---
3 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 jupyterjsc/z2jh/kustomize-maint/kustomization.yaml
diff --git a/jupyterjsc/custom/fleet.yaml b/jupyterjsc/custom/fleet.yaml
index 5ab7858a..aac7220e 100644
--- a/jupyterjsc/custom/fleet.yaml
+++ b/jupyterjsc/custom/fleet.yaml
@@ -30,6 +30,7 @@ helm:
body: "All running JupyterLabs will be stopped during this maintenance."
services:
JupyterLab:
+ defaultOption: "4.3"
"4.3":
allowedLists:
groups:
@@ -89,7 +90,6 @@ targetCustomizations:
clusterSelector:
matchLabels:
stage: production
- maintenance: "false"
helm:
values:
global:
@@ -112,7 +112,7 @@ targetCustomizations:
clusterSelector:
matchLabels:
stage: production
- maintenance: "true"
+ maintenance: "true-disabl"
helm:
values:
ingress:
diff --git a/jupyterjsc/z2jh/kustomize-maint/kustomization.yaml b/jupyterjsc/z2jh/kustomize-maint/kustomization.yaml
deleted file mode 100644
index 07d927ef..00000000
--- a/jupyterjsc/z2jh/kustomize-maint/kustomization.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# InitContainer list in hub component:
-# 0 - prepare-shared-data
-# Container list in hub component:
-# 0 - check-frontend-files
-# 1 - sidecar-nginx
-# 2 - hub
-patches:
-- target:
- kind: Deployment
- labelSelector: component=hub
- patch: |-
- - op: add
- path: /spec/template/spec/containers/2/envFrom
- value:
- - secretRef:
- name: generics
- - op: replace
- path: /spec/replicas
- value: 0
-- target:
- kind: Ingress
- group: networking.k8s.io
- version: v1
- labelSelector: app=jupyterhub
- patch: |-
- - op: replace
- path: "/spec/rules/0/http/paths/0/backend/service/port/name"
- value: https
diff --git a/maintenance/values/overlays/production/hosts.yaml b/maintenance/values/overlays/production/hosts.yaml
index d0b1697b..75518bb2 100644
--- a/maintenance/values/overlays/production/hosts.yaml
+++ b/maintenance/values/overlays/production/hosts.yaml
@@ -1,9 +1,9 @@
ingress:
hosts:
- - host: jupyter.jsc.fz-juelich.de
- secretName: jupyterjsc-tls
- - host: jupyter-jsc.fz-juelich.de
- secretName: jupyterjsc-tls-old
+ #- host: jupyter.jsc.fz-juelich.de
+ # secretName: jupyterjsc-tls
+ #- host: jupyter-jsc.fz-juelich.de
+ # secretName: jupyterjsc-tls-old
- host: jupyter.eurocc-gcs.de
secretName: eurocc-tls
#- host: juniq.fz-juelich.de
--
GitLab