Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable nublado3 usdfprod #2329

Merged
merged 3 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 174 additions & 0 deletions applications/nublado/values-usdfprod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
controller:
config:
safir:
logLevel: "DEBUG"
fileserver:
enabled: true
timeout: 21600

images:
source:
type: "docker"
registry: "docker-registry.slac.stanford.edu"
repository: "lsstsqre/sciplat-lab"
recommendedTag: "recommended"
numReleases: 1
numWeeklies: 2
numDailies: 3

lab:
pullSecret: "pull-secret"

homedirSchema: "initialThenUsername"

env:
AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/software/jupyterlab/secrets/aws-credentials.ini"
AUTO_REPO_SPECS: "https://github.com/lsst-sqre/system-test@prod,https://github.com/rubin-dp0/tutorial-notebooks@prod"
DAF_BUTLER_REPOSITORY_INDEX: "/project/data-repos.yaml"
HUB_ROUTE: "/nb/hub"
PGPASSFILE: "/opt/lsst/software/jupyterlab/secrets/postgres-credentials.txt"
PGUSER: "rubin"
S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
http_proxy: "http://sdfproxy.sdf.slac.stanford.edu:3128"
https_proxy: "http://sdfproxy.sdf.slac.stanford.edu:3128"
no_proxy: "hub.nublado,.sdf.slac.stanford.edu,.slac.stanford.edu,localhost,127.0.0.1"

files:
# Add rubin_users group (there is not yet a simpler way to do this).
/etc/group:
contents: |
root:x:0:
bin:x:1:
daemon:x:2:
sys:x:3:
adm:x:4:
tty:x:5:
disk:x:6:
lp:x:7:
mem:x:8:
kmem:x:9:
wheel:x:10:
cdrom:x:11:
mail:x:12:
man:x:15:
dialout:x:18:
floppy:x:19:
games:x:20:
utmp:x:22:
tape:x:33:
utempter:x:35:
video:x:39:
ftp:x:50:
lock:x:54:
tss:x:59:
audio:x:63:
dbus:x:81:
screen:x:84:
nobody:x:99:
users:x:100:
systemd-journal:x:190:
systemd-network:x:192:
cgred:x:997:
ssh_keys:x:998:
input:x:999:
rubin_users:x:4085:

secrets:
- secretName: "nublado-lab-secret"
secretKey: "aws-credentials.ini"
- secretName: "nublado-lab-secret"
secretKey: "postgres-credentials.txt"

volumes:
- containerPath: "/home"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "sdf-home"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/project"
subPath: "g"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "sdf-group-rubin"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/sdf/group/rubin"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "sdf-group-rubin"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/sdf/data/rubin"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "sdf-data-rubin"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/scratch"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "sdf-scratch"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/fs/ddn/sdf/group/rubin"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "fs-ddn-sdf-group-rubin"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"
- containerPath: "/fs/ddn/sdf/group/lsst"
mode: "rw"
source:
type: "persistentVolumeClaim"
storageClassName: "fs-ddn-sdf-group-lsst"
accessModes:
- "ReadWriteMany"
resources:
requests:
storage: "1Gi"

proxy:
ingress:
annotations:
# proxy-body-size is temporary until USDF uses our normal ingress-nginx,
# which already configures a larger value.
nginx.ingress.kubernetes.io/proxy-body-size: "50m"

# These are substantially shorter than the default timeouts (it's not
# clear why).
nginx.ingress.kubernetes.io/proxy-connect-timeout: "30"
nginx.ingress.kubernetes.io/proxy-read-timeout: "20"

jupyterhub:
hub:
db:
url: "postgresql://[email protected]/nublado3"
cull:
timeout: 432000
every: 300
maxAge: 2160000
1 change: 1 addition & 0 deletions applications/nublado2/values-usdfprod.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
jupyterhub:

hub:
baseUrl: "/n2"
config:
ServerApp:
shutdown_no_activity_timeout: 432000
Expand Down
2 changes: 1 addition & 1 deletion environments/values-usdfprod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ narrativelog:
noteburst:
enabled: false
nublado:
enabled: false
enabled: true
nublado2:
enabled: true
ook:
Expand Down
Loading