From 3c530082761d03d00aa95637627510e1a6c9bd8f Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 5 Feb 2024 11:43:06 +0100 Subject: [PATCH] Separate jupyter per customer --- .../overlays/test/hig/jupyterhub-ingress.yml | 32 +++++++++++++++++++ .../overlays/test/hig/jupyterhub-service.yml | 25 +++++++++++++++ .../test/{ => hig}/kustomization.yaml | 2 +- .../test/{ => su}/jupyterhub-ingress.yml | 6 ++-- .../test/{ => su}/jupyterhub-service.yml | 2 +- jupyter/overlays/test/su/kustomization.yaml | 7 ++++ .../test/sunet/jupyterhub-ingress.yml | 32 +++++++++++++++++++ .../test/sunet/jupyterhub-service.yml | 25 +++++++++++++++ .../overlays/test/sunet/kustomization.yaml | 7 ++++ .../overlays/test/uu/jupyterhub-ingress.yml | 32 +++++++++++++++++++ .../overlays/test/uu/jupyterhub-service.yml | 25 +++++++++++++++ jupyter/overlays/test/uu/kustomization.yaml | 7 ++++ 12 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 jupyter/overlays/test/hig/jupyterhub-ingress.yml create mode 100644 jupyter/overlays/test/hig/jupyterhub-service.yml rename jupyter/overlays/test/{ => hig}/kustomization.yaml (89%) rename jupyter/overlays/test/{ => su}/jupyterhub-ingress.yml (84%) rename jupyter/overlays/test/{ => su}/jupyterhub-service.yml (93%) create mode 100644 jupyter/overlays/test/su/kustomization.yaml create mode 100644 jupyter/overlays/test/sunet/jupyterhub-ingress.yml create mode 100644 jupyter/overlays/test/sunet/jupyterhub-service.yml create mode 100644 jupyter/overlays/test/sunet/kustomization.yaml create mode 100644 jupyter/overlays/test/uu/jupyterhub-ingress.yml create mode 100644 jupyter/overlays/test/uu/jupyterhub-service.yml create mode 100644 jupyter/overlays/test/uu/kustomization.yaml diff --git a/jupyter/overlays/test/hig/jupyterhub-ingress.yml b/jupyter/overlays/test/hig/jupyterhub-ingress.yml new file mode 100644 index 0000000..9d02575 --- /dev/null +++ b/jupyter/overlays/test/hig/jupyterhub-ingress.yml @@ -0,0 +1,32 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: jupyterhub-ingress + namespace: hig-jupyterhub + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" +spec: + defaultBackend: + service: + name: proxy-public + port: + number: 8443 + tls: + - hosts: + - hig-jupyter.drive.test.sunet.se + secretName: tls-secret + + rules: + - host: hig-jupyter.drive.test.sunet.se + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: proxy-public + port: + number: 80 diff --git a/jupyter/overlays/test/hig/jupyterhub-service.yml b/jupyter/overlays/test/hig/jupyterhub-service.yml new file mode 100644 index 0000000..8333fe5 --- /dev/null +++ b/jupyter/overlays/test/hig/jupyterhub-service.yml @@ -0,0 +1,25 @@ +--- +apiVersion: v1 +items: +- apiVersion: v1 + kind: Service + metadata: + labels: + app: jupyterhub-node + name: jupyterhub-node + namespace: hig-jupyterhub + spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: jupyterhub-node + sessionAffinity: None + type: ClusterIP + status: + loadBalancer: {} +kind: List +metadata: + resourceVersion: "" + selfLink: "" diff --git a/jupyter/overlays/test/kustomization.yaml b/jupyter/overlays/test/hig/kustomization.yaml similarity index 89% rename from jupyter/overlays/test/kustomization.yaml rename to jupyter/overlays/test/hig/kustomization.yaml index b7be5d7..f6cfc47 100644 --- a/jupyter/overlays/test/kustomization.yaml +++ b/jupyter/overlays/test/hig/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base/ +- ../../../base/ patches: - path: jupyterhub-ingress.yml - path: jupyterhub-service.yml diff --git a/jupyter/overlays/test/jupyterhub-ingress.yml b/jupyter/overlays/test/su/jupyterhub-ingress.yml similarity index 84% rename from jupyter/overlays/test/jupyterhub-ingress.yml rename to jupyter/overlays/test/su/jupyterhub-ingress.yml index 0e6ce52..147c734 100644 --- a/jupyter/overlays/test/jupyterhub-ingress.yml +++ b/jupyter/overlays/test/su/jupyterhub-ingress.yml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: jupyterhub-ingress - namespace: jupyterhub + namespace: su-jupyterhub annotations: kubernetes.io/ingress.class: traefik traefik.ingress.kubernetes.io/router.entrypoints: websecure @@ -16,11 +16,11 @@ spec: number: 8443 tls: - hosts: - - jupyter.drive.test.sunet.se + - su-jupyter.drive.test.sunet.se secretName: tls-secret rules: - - host: jupyter.drive.test.sunet.se + - host: su-jupyter.drive.test.sunet.se http: paths: - path: / diff --git a/jupyter/overlays/test/jupyterhub-service.yml b/jupyter/overlays/test/su/jupyterhub-service.yml similarity index 93% rename from jupyter/overlays/test/jupyterhub-service.yml rename to jupyter/overlays/test/su/jupyterhub-service.yml index f6bd01d..77a25d2 100644 --- a/jupyter/overlays/test/jupyterhub-service.yml +++ b/jupyter/overlays/test/su/jupyterhub-service.yml @@ -7,7 +7,7 @@ items: labels: app: jupyterhub-node name: jupyterhub-node - namespace: jupyterhub + namespace: su-jupyterhub spec: ports: - port: 8080 diff --git a/jupyter/overlays/test/su/kustomization.yaml b/jupyter/overlays/test/su/kustomization.yaml new file mode 100644 index 0000000..f6cfc47 --- /dev/null +++ b/jupyter/overlays/test/su/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../../base/ +patches: +- path: jupyterhub-ingress.yml +- path: jupyterhub-service.yml diff --git a/jupyter/overlays/test/sunet/jupyterhub-ingress.yml b/jupyter/overlays/test/sunet/jupyterhub-ingress.yml new file mode 100644 index 0000000..4ec4023 --- /dev/null +++ b/jupyter/overlays/test/sunet/jupyterhub-ingress.yml @@ -0,0 +1,32 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: jupyterhub-ingress + namespace: sunet-jupyterhub + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" +spec: + defaultBackend: + service: + name: proxy-public + port: + number: 8443 + tls: + - hosts: + - sunet-jupyter.drive.test.sunet.se + secretName: tls-secret + + rules: + - host: sunet-jupyter.drive.test.sunet.se + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: proxy-public + port: + number: 80 diff --git a/jupyter/overlays/test/sunet/jupyterhub-service.yml b/jupyter/overlays/test/sunet/jupyterhub-service.yml new file mode 100644 index 0000000..9ae5404 --- /dev/null +++ b/jupyter/overlays/test/sunet/jupyterhub-service.yml @@ -0,0 +1,25 @@ +--- +apiVersion: v1 +items: +- apiVersion: v1 + kind: Service + metadata: + labels: + app: jupyterhub-node + name: jupyterhub-node + namespace: sunet-jupyterhub + spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: jupyterhub-node + sessionAffinity: None + type: ClusterIP + status: + loadBalancer: {} +kind: List +metadata: + resourceVersion: "" + selfLink: "" diff --git a/jupyter/overlays/test/sunet/kustomization.yaml b/jupyter/overlays/test/sunet/kustomization.yaml new file mode 100644 index 0000000..f6cfc47 --- /dev/null +++ b/jupyter/overlays/test/sunet/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../../base/ +patches: +- path: jupyterhub-ingress.yml +- path: jupyterhub-service.yml diff --git a/jupyter/overlays/test/uu/jupyterhub-ingress.yml b/jupyter/overlays/test/uu/jupyterhub-ingress.yml new file mode 100644 index 0000000..9b29566 --- /dev/null +++ b/jupyter/overlays/test/uu/jupyterhub-ingress.yml @@ -0,0 +1,32 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: jupyterhub-ingress + namespace: uu-jupyterhub + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" +spec: + defaultBackend: + service: + name: proxy-public + port: + number: 8443 + tls: + - hosts: + - uu-jupyter.drive.test.sunet.se + secretName: tls-secret + + rules: + - host: uu-jupyter.drive.test.sunet.se + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: proxy-public + port: + number: 80 diff --git a/jupyter/overlays/test/uu/jupyterhub-service.yml b/jupyter/overlays/test/uu/jupyterhub-service.yml new file mode 100644 index 0000000..2783f60 --- /dev/null +++ b/jupyter/overlays/test/uu/jupyterhub-service.yml @@ -0,0 +1,25 @@ +--- +apiVersion: v1 +items: +- apiVersion: v1 + kind: Service + metadata: + labels: + app: jupyterhub-node + name: jupyterhub-node + namespace: uu-jupyterhub + spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: jupyterhub-node + sessionAffinity: None + type: ClusterIP + status: + loadBalancer: {} +kind: List +metadata: + resourceVersion: "" + selfLink: "" diff --git a/jupyter/overlays/test/uu/kustomization.yaml b/jupyter/overlays/test/uu/kustomization.yaml new file mode 100644 index 0000000..f6cfc47 --- /dev/null +++ b/jupyter/overlays/test/uu/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../../base/ +patches: +- path: jupyterhub-ingress.yml +- path: jupyterhub-service.yml