Commit d357d314 authored by Craig Russell's avatar Craig Russell
Browse files

Merge branch 'staging' of https://github.com/bioimagearchive/k8s-jupyterhub into staging

parents f5ecaa6e 7a046b44
......@@ -9,17 +9,20 @@
# # bearerToken: true
# # clusterURI: "https://kubernetes.default"
# # # bearerTokenPath: "/path/to/custom/bearer/token/file"
# kubeContext: "internal"
# clusterURI: "https://kubernetes.default"
# kubeContext: "internal"
# clusterURI: "https://kubernetes.default"
# bearerToken: true
# bearerTokenPath: "/var/run/secrets/kubernetes.io/serviceaccount/token" # optional if a token is provided by the user in another location
metadata:
settings:
globalHooks:
preInstall: "persistentVolumes/biostudies.yaml"
metadata:
organization: EBI
maintainer: Craig Russell (ctr26@ebi.ac.uk)
description: EBI hub deployment
helmRepos:
jupyterhub: "https://jupyterhub.github.io/helm-chart/"
daskgateway: "https://dask.org/dask-gateway-helm-repo/"
......@@ -47,8 +50,6 @@ appsTemplates:
# config.DockerRegistry.url: "https://dockerhub.ebi.ac.uk"
config.DockerRegistry.token_url: ""
jupyterhub: &jupyterhub
name: "jupyterhub"
chart: "jupyterhub/jupyterhub"
......@@ -119,54 +120,55 @@ apps:
name: "jupyterhub-sandbox-staging"
group: "staging"
namespace: "jupyterhub-sandbox-staging"
hooks:
preInstall: "jupyterhub/staging/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/staging/config.yaml"
- "jupyterhub/sandbox.yaml"
- "jupyterhub/staging/sandbox.yaml"
jupyterhub-sandbox-production:
<<: *jupyterhub
name: "jupyterhub-sandbox-production"
group: "production"
namespace: "jupyterhub-sandbox-production"
hooks:
preInstall: "jupyterhub/production/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/production/config.yaml"
- "jupyterhub/sandbox.yaml"
- "jupyterhub/production/sandbox.yaml"
# -------------------- JUNK ----------------------------------
# jupyterhub-test:
# valuesFiles:
# - "values/jupyterhub-config.yaml"
# # - "values/staging/jupyterhub-config.yaml"
# - "values/jupyterhub-sandbox.yaml"
# # - "values/staging/jupyterhub-sandbox.yaml"
# name: "jupyterhub-staging"
# namespace: "staging"
# chart: "jupyterhub/jupyterhub"
# # version: "0.9.0"
# version: "0.10.2-n047.hb387f987"
# enabled: true
# priority: 0
# timeout: 1200
# # wait: true
# set:
# proxy.secretToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
# -------------------- JUNK ----------------------------------
# jupyterhub-test:
# valuesFiles:
# - "values/jupyterhub-config.yaml"
# # - "values/staging/jupyterhub-config.yaml"
# - "values/jupyterhub-sandbox.yaml"
# # - "values/staging/jupyterhub-sandbox.yaml"
# name: "jupyterhub-staging"
# namespace: "staging"
# chart: "jupyterhub/jupyterhub"
# # version: "0.9.0"
# version: "0.10.2-n047.hb387f987"
# enabled: true
# priority: 0
# timeout: 1200
# # wait: true
# set:
# proxy.secretToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
# binderhub:
# valuesFiles:
# - "binderhub/secret.yaml"
# - "binderhub/config.yaml"
# - "binderhub/production.yaml"
# name: "binderhub"
# namespace: "staging"
# protected: true
# chart: "jupyterhub/binderhub"
# version: "0.2.0-n361.h6f57706"
# enabled: true
# priority: 0
# # set:
\ No newline at end of file
# binderhub:
# valuesFiles:
# - "binderhub/secret.yaml"
# - "binderhub/config.yaml"
# - "binderhub/production.yaml"
# name: "binderhub"
# namespace: "staging"
# protected: true
# chart: "jupyterhub/binderhub"
# version: "0.2.0-n361.h6f57706"
# enabled: true
# priority: 0
# # set:
......@@ -29,6 +29,14 @@ 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
tag: latest
......@@ -39,23 +47,23 @@ singleuser:
memory:
limit: 1G
guarantee: 256M
# networkPolicy:
# enabled: true
# # Block all except:
# # - internal DNS
# # - EMBL-EBI and University of Dundee
# egress:
# - to:
# - ipBlock:
# cidr: 10.0.0.0/8
# ports:
# - port: 53
# protocol: UDP
# - to:
# - ipBlock:
# cidr: 193.60.0.0/14
# - ipBlock:
# cidr: 134.36.0.0/16
# networkPolicy:
# enabled: true
# # Block all except:
# # - internal DNS
# # - EMBL-EBI and University of Dundee
# egress:
# - to:
# - ipBlock:
# cidr: 10.0.0.0/8
# ports:
# - port: 53
# protocol: UDP
# - to:
# - ipBlock:
# cidr: 193.60.0.0/14
# - ipBlock:
# cidr: 134.36.0.0/16
extraEnv:
IDR_HOST: idr.openmicroscopy.org
IDR_USER: public
......
ingress:
hosts:
- minikube.local
- ""
- localhost
tls:
- hosts:
- minikube.local
- localhost
singleuser:
storage:
type: none
extraVolumes:
- name: nfs-bs-ftp
persistentVolumeClaim:
claimName: "nfs-bs-ftp-pvc-jupyterhub-production"
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: "nfs-bs-ftp-pvc-jupyterhub-production"
spec:
storageClassName: nfs
accessModes:
- ReadOnlyMany
resources:
requests:
storage: 10Gi
volumeName: "nfs-bs-ftp-pv"
......@@ -32,6 +32,8 @@ singleuser:
# extraVolumeMounts:
# - name: shm-volume
# mountPath: /dev/shm
storage:
storage: none
memory:
limit: 3G
guarantee: 1G
......
ingress:
hosts:
- minikube.local
- ""
- localhost
tls:
- hosts:
- minikube.local
- localhost
singleuser:
storage:
type: none
extraVolumes:
- name: nfs-bs-ftp
persistentVolumeClaim:
claimName: "nfs-bs-ftp-pvc-jupyterhub-staging"
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: "nfs-bs-ftp-pvc-jupyterhub-staging"
spec:
storageClassName: nfs
accessModes:
- ReadOnlyMany
resources:
requests:
storage: 10Gi
volumeName: "nfs-bs-ftp-pv"
apiVersion: v1
kind: PersistentVolume
metadata:
name: nfs-bs-ftp-pv
spec:
storageClassName: nfs
capacity:
storage: 10Gi
accessModes:
- ReadOnlyMany
nfs:
# path: /tmp
# server: 172.17.0.2
server: 10.35.105.251 # Change this!
path: "/fg_biostudies/.adm/databases/prod/submission/ftp/"
readOnly: true
# persistentVolumeReclaimPolicy:
# Recycle
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