Commit 5a16759b authored by Craig Russell's avatar Craig Russell
Browse files

Jupyterhub updates (cleaning and standards really)

parent f7eb4274
......@@ -78,8 +78,10 @@ appsTemplates:
proxy.secretToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
auth.github.clientId: "$SECRET_GITHUB_CLIENTID"
auth.github.clientSecret: "$SECRET_GITHUB_CLIENTSECRET"
hooks:
preUpgrade: "persistentVolumes/biostudies.yaml"
# ingress.hosts: "binder.bioimagearchive.org"
# hooks:
# preUpgrade: "persistentVolumes/biostudies.yaml"
dask: &dask
name: "daskgateway"
......@@ -173,9 +175,10 @@ apps:
# preInstall: "jupyterhub/staging/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
# - "jupyterhub/persistentVolumes.yaml"
- "jupyterhub/staging/config.yaml"
- "jupyterhub/sandbox.yaml"
- "jupyterhub/staging/sandbox.yaml"
# - "jupyterhub/staging/sandbox.yaml"
jupyterhub-sandbox-production:
<<: *jupyterhub
......@@ -186,9 +189,10 @@ apps:
# preInstall: "jupyterhub/production/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
# - "jupyterhub/persistentVolumes.yaml"
- "jupyterhub/production/config.yaml"
- "jupyterhub/sandbox.yaml"
- "jupyterhub/production/sandbox.yaml"
# - "jupyterhub/production/sandbox.yaml"
# -------------------- JUNK ----------------------------------
# jupyterhub-test:
# valuesFiles:
......@@ -214,9 +218,11 @@ apps:
group: "staging"
namespace: "jupyterhub-github-staging"
set:
auth.github.callbackUrl: "$HOST_NAME/staging/github/hub/oauth_callback"
auth.github.callbackUrl: "staging.$HOST_NAME/github/hub/oauth_callback"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/staging/config.yaml"
# - "jupyterhub/persistentVolumes.yaml"
- "jupyterhub/github.yaml"
- "jupyterhub/staging/github.yaml"
......@@ -229,8 +235,10 @@ apps:
auth.github.callbackUrl: "$HOST_NAME/github/hub/oauth_callback"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/production/config.yaml"
# - "jupyterhub/persistentVolumes.yaml"
- "jupyterhub/github.yaml"
- "jupyterhub/production/github.yaml"
# - "jupyterhub/production/github.yaml"
# -------------------- JUNK ----------------------------------
# jupyterhub-test:
# valuesFiles:
......
......@@ -2,7 +2,7 @@
# Overridden in production deployments
hub:
baseUrl: /staging/
# baseUrl: /staging/
db:
type: sqlite-memory
networkPolicy:
......@@ -29,24 +29,16 @@ cull:
singleuser:
storage:
type: none
extraVolumes:
- name: nfs-bs-ftp
persistentVolumeClaim:
claimName: nfs-bs-ftp-pvc
extraVolumeMounts:
- name: nfs-bs-ftp
mountPath: /home/jovyan/biostudies
# # readOnly: true
image:
name: bioimagearchive/jupyter-hub-docker:20210202
tag: latest
name: bioimagearchive/jupyter-hub-docker
tag: "20210202"
startTimeout: 1800
cpu:
limit: 1
guarantee: 0.1
limit: 4
guarantee: 2
memory:
limit: 1G
guarantee: 256M
limit: 4G
guarantee: 1G
# networkPolicy:
# enabled: true
# # Block all except:
......@@ -81,9 +73,9 @@ ingress:
hosts:
- ""
- localhost
# annotations:
# kubernetes.io/ingress.class: nginx
# nginx.ingress.kubernetes.io/proxy-body-size: 2m
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/proxy-body-size: 2m
# tls:
# - hosts:
# - ""
......@@ -88,11 +88,6 @@ singleuser:
extra_resource_limits:
nvidia.com/gpu: "1"
ingress:
enabled: true
hosts:
- localhost
- ""
# - http://45.86.170.228/
# annotations:
# kubernetes.io/ingress.class: nginx
......
ingress:
enabled: true
hosts:
- "binder.bioimagearchive.org"
\ No newline at end of file
......@@ -24,5 +24,4 @@
# hook:
# enabled: true
hub:
baseUrl: /github
......@@ -50,11 +50,12 @@ singleuser:
# prePuller:
# enabled: false
ingress:
enabled: true
hosts:
- ""
- localhost
# ingress:
# enabled: true
# hosts:
# - ""
# - localhost
# - "binder.bioimagearchive.org"
# annotations:
# nginx.ingress.kubernetes.io/rewrite-target: /$2
# nginx.ingress.kubernetes.io/ssl-redirect: "false"
......
ingress:
enabled: true
hosts:
- "staging.binder.bioimagearchive.org"
\ No newline at end of file
......@@ -25,4 +25,5 @@
# enabled: true
hub:
baseUrl: /github-staging
baseUrl: /github
# https://zero-to-jupyterhub.readthedocs.io/en/latest/setup-jupyterhub.html
# # https://zero-to-jupyterhub.readthedocs.io/en/latest/setup-jupyterhub.html
# Local deployment from git checkout of https://github.com/jupyterhub/zero-to-jupyterhub-k8s.git
# Commit 7e9089b46c23fc1177c17cf1bef74d137cbba2ef (v0.4-580-g7e9089b)
# # Local deployment from git checkout of https://github.com/jupyterhub/zero-to-jupyterhub-k8s.git
# # Commit 7e9089b46c23fc1177c17cf1bef74d137cbba2ef (v0.4-580-g7e9089b)
hub:
baseUrl: /sandbox-staging
# hub:
# baseUrl: /sandbox
# auth:
# type: tmp
# # auth:
# # type: tmp
# singleuser:
# # Sudo access: might be dangerous with the wrong kubernetes security?
# # extraEnv:
# # GRANT_SUDO: "yes"
# # NOTEBOOK_ARGS: "--allow-root"
# # uid: 0
# # Unsure if this is needed
# cmd: start-singleuser.sh
# # Use jupyterlab as default workspace
# defaultUrl: "/lab"
# #
# # image:
# # name: bioimagearchive/imageanalysis-notebook
# # tag: latest
# # storage:
# # capacity: 15G
# # extraVolumes:
# # - name: shm-volume
# # emptyDir:
# # medium: Memory
# # extraVolumeMounts:
# # - name: shm-volume
# # mountPath: /dev/shm
# memory:
# limit: 3G
# guarantee: 1G
# cpu:
# limit: 2
# guarantee: 1
# lifecycleHooks:
# postStart:
# exec:
# command: ["cp", "-a", "src", "target"]
# # singleuser:
# # # Sudo access: might be dangerous with the wrong kubernetes security?
# # # extraEnv:
# # # GRANT_SUDO: "yes"
# # # NOTEBOOK_ARGS: "--allow-root"
# # # uid: 0
# # # Unsure if this is needed
# # cmd: start-singleuser.sh
# # # Use jupyterlab as default workspace
# # defaultUrl: "/lab"
# # #
# # # image:
# # # name: bioimagearchive/imageanalysis-notebook
# # # tag: latest
# # # storage:
# # # capacity: 15G
# # # extraVolumes:
# # # - name: shm-volume
# # # emptyDir:
# # # medium: Memory
# # # extraVolumeMounts:
# # # - name: shm-volume
# # # mountPath: /dev/shm
# # memory:
# # limit: 3G
# # guarantee: 1G
# # cpu:
# # limit: 2
# # guarantee: 1
# # lifecycleHooks:
# # postStart:
# # exec:
# # command: ["cp", "-a", "src", "target"]
# # # Disable pre-puller, fails with rbac
# # # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues/118
# # prePuller:
# # enabled: false
# ingress:
# enabled: true
# hosts:
# - ""
# - localhost
# # annotations:
# # nginx.ingress.kubernetes.io/rewrite-target: /$2
# # nginx.ingress.kubernetes.io/ssl-redirect: "false"
# # # # - jupyter.EXAMPLE.org
# # # annotations:
# # # kubernetes.io/ingress.class: nginx
# # # ingress.kubernetes.io/proxy-body-size: 16m
# # # ingress.kubernetes.io/proxy-read-timeout: 3600
# # # ingress.kubernetes.io/proxy-send-timeout: 3600
# # # kubernetes.io/tls-acme: 'true'
# # # tls:
# # # - hosts:
# # # - "jupyter.EXAMPLE.org"
# # # secretName: example-tls
# ## Enable ingress object, but the ingress controller needs to be installed
# ## for this to take effect.
# # # # Disable pre-puller, fails with rbac
# # # # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues/118
# # # prePuller:
# # # enabled: false
# # ingress:
# # enabled: true
# # annotations:
# # ingress.kubernetes.io/proxy-body-size: 64m
# # kubernetes.io/ingress.class: nginx
# # kubernetes.io/tls-acme: "true"
# # hosts:
# # - jupyter.domain.com
# # tls:
# # - secretName: mysecret
# # hosts:
# # - jupyter.domain.com
# # hosts:
# # - ""
# # - localhost
# # # annotations:
# # # nginx.ingress.kubernetes.io/rewrite-target: /$2
# # # nginx.ingress.kubernetes.io/ssl-redirect: "false"
# # # # # - jupyter.EXAMPLE.org
# # # # annotations:
# # # # kubernetes.io/ingress.class: nginx
# # # # ingress.kubernetes.io/proxy-body-size: 16m
# # # # ingress.kubernetes.io/proxy-read-timeout: 3600
# # # # ingress.kubernetes.io/proxy-send-timeout: 3600
# # # # kubernetes.io/tls-acme: 'true'
# # # # tls:
# # # # - hosts:
# # # # - "jupyter.EXAMPLE.org"
# # # # secretName: example-tls
# # ## Enable ingress object, but the ingress controller needs to be installed
# # ## for this to take effect.
# # # ingress:
# # # enabled: true
# # # annotations:
# # # ingress.kubernetes.io/proxy-body-size: 64m
# # # kubernetes.io/ingress.class: nginx
# # # kubernetes.io/tls-acme: "true"
# # # hosts:
# # # - jupyter.domain.com
# # # tls:
# # # - secretName: mysecret
# # # hosts:
# # # - jupyter.domain.com
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment