Skip to content

Commit

Permalink
Chore/deploy workspaces heal preprod (#2704)
Browse files Browse the repository at this point in the history
* Deploy workspaces and 2021.03 to heal preprod

* Configure hatchery.json to default jupyter-pods namespace
  • Loading branch information
em-ingram authored Mar 31, 2021
1 parent 9f97370 commit cabf0cf
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 5 deletions.
12 changes: 7 additions & 5 deletions preprod.healdata.org/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,26 @@
"autodeploy": "yes"
},
"versions": {
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.03",
"aws-es-proxy": "abutaha/aws-es-proxy:0.8",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.03",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.10.2-debian-cloudwatch-1.0",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.03",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2021.03",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.03",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2021.03",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.03",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.03",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.03",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2021.03",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.03",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.03",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.03",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.03",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2021.03",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.03",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2021.03",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.03",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2021.03",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.03",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2021.03"
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.03"
},
"arborist": {
"deployment_version": "2"
Expand Down
129 changes: 129 additions & 0 deletions preprod.healdata.org/manifests/hatchery/hatchery.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"user-namespace": "jupyter-pods",
"sub-dir": "/lw-workspace",
"user-volume-size": "10Gi",
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "quay.io/cdis/gen3fuse-sidecar:2021.03",
"env": {
"NAMESPACE": "default",
"HOSTNAME": "preprod.healdata.org"
},
"args": [],
"command": [
"/bin/bash",
"/sidecarDockerrun.sh"
],
"lifecycle-pre-stop": [
"su",
"-c",
"echo test",
"-s",
"/bin/sh",
"root"
]
},
"containers": [
{
"target-port": 8787,
"cpu-limit": "1.0",
"memory-limit": "512Mi",
"name": "R Studio",
"image": "heliumdatastage/rstudio-server:1",
"env": {
"DISABLE_AUTH": "true"
},
"args": [],
"path-rewrite": "/",
"use-tls": "false",
"ready-probe": "/"
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "512Mi",
"name": "Jupyter Notebook Bio Python",
"image": "quay.io/occ_data/jupyternotebook:1.9.0",
"env": {},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.notebook_dir='/home/jovyan/pd'",
"--NotebookApp.quit_button=False"
],
"command": [
"start-notebook.sh"
],
"path-rewrite": "/lw-workspace/proxy/",
"use-tls": "false",
"ready-probe": "/lw-workspace/proxy/",
"lifecycle-post-start": [
"/bin/sh",
"-c",
"export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100,
"user-volume-location": "/home/jovyan/pd"
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "8192Mi",
"name": "Jupyter Notebook Power Python",
"image": "quay.io/occ_data/jupyternotebook:1.7.2",
"env": {},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.notebook_dir='/home/jovyan/pd'",
"--NotebookApp.quit_button=False"
],
"command": [
"start-notebook.sh"
],
"path-rewrite": "/lw-workspace/proxy/",
"use-tls": "false",
"ready-probe": "/lw-workspace/proxy/",
"lifecycle-post-start": [
"/bin/sh",
"-c",
"export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100,
"user-volume-location": "/home/jovyan/pd"
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "8096Mi",
"name": "Helium Autoencoder Demo",
"image": "quay.io/cdis/auntoencoder-copd-demo:latest",
"env": {},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.notebook_dir='/home/jovyan/pd'",
"--NotebookApp.quit_button=False"
],
"command": [
"start-notebook.sh"
],
"path-rewrite": "/lw-workspace/proxy/",
"use-tls": "false",
"ready-probe": "/lw-workspace/proxy/",
"lifecycle-post-start": [
"/bin/sh",
"-c",
"export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100
}
]
}

0 comments on commit cabf0cf

Please sign in to comment.