Commit 6450c960 authored by Craig Russell's avatar Craig Russell
Browse files

Merge branch 'biostudies_mount' into staging

parents 267911ae aad60b8d
......@@ -70,6 +70,8 @@ appsTemplates:
proxy.secretToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
auth.github.clientId: "$SECRET_GITHUB_CLIENTID"
auth.github.clientSecret: "$SECRET_GITHUB_CLIENTSECRET"
hooks:
preUpgrade: "persistentVolumes/biostudies.yaml"
dask: &dask
name: "daskgateway"
......@@ -146,8 +148,8 @@ apps:
name: "jupyterhub-sandbox-staging"
group: "staging"
namespace: "jupyterhub-sandbox-staging"
hooks:
preInstall: "jupyterhub/staging/volumes/biostudies.yaml"
# hooks:
# preInstall: "jupyterhub/staging/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/staging/config.yaml"
......@@ -159,8 +161,8 @@ apps:
name: "jupyterhub-sandbox-production"
group: "production"
namespace: "jupyterhub-sandbox-production"
hooks:
preInstall: "jupyterhub/production/volumes/biostudies.yaml"
# hooks:
# preInstall: "jupyterhub/production/volumes/biostudies.yaml"
valuesFiles:
- "jupyterhub/config.yaml"
- "jupyterhub/production/config.yaml"
......
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"
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"
......@@ -14,5 +14,20 @@ spec:
server: 10.35.105.251 # Change this!
path: "/fg_biostudies/.adm/databases/prod/submission/ftp/"
readOnly: true
# claimRef:
# name: nfs-bs-ftp-pvc
# persistentVolumeReclaimPolicy:
# Recycle
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: "nfs-bs-ftp-pvc"
spec:
storageClassName: nfs
accessModes:
- ReadOnlyMany
resources:
requests:
storage: 10Gi
volumeName: "nfs-bs-ftp-pv"
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