Skip to content

Commit

Permalink
Merge pull request #1255 from uc-cdis/feat/qa-heal-workspaces
Browse files Browse the repository at this point in the history 
Feat/qa heal workspaces
  • Loading branch information
@em-ingram
em-ingram authored Mar 12, 2021
2 parents e9f4770 + dca1edf commit 27551a5
Show file tree
Hide file tree
Showing 2 changed files with 146 additions and 15 deletions.
32 changes: 17 additions & 15 deletions qa-heal.planx-pla.net/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@
"That's all I have to say"
],
"versions": {
"arborist": "quay.io/cdis/arborist:2020.11",
"arborist": "quay.io/cdis/arborist:2021.03",
"aws-es-proxy": "abutaha/aws-es-proxy:0.8",
"fence": "quay.io/cdis/fence:2020.11",
"fence": "quay.io/cdis/fence:2021.03",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.10.2-debian-cloudwatch-1.0",
"indexd": "quay.io/cdis/indexd:2020.11",
"peregrine": "quay.io/cdis/peregrine:2020.11",
"pidgin": "quay.io/cdis/pidgin:2020.11",
"indexd": "quay.io/cdis/indexd:2021.03",
"peregrine": "quay.io/cdis/peregrine:2021.03",
"pidgin": "quay.io/cdis/pidgin:2021.03",
"portal": "quay.io/cdis/data-portal:2.45.0",
"revproxy": "quay.io/cdis/nginx:2020.11",
"sheepdog": "quay.io/cdis/sheepdog:2020.11",
"ssjdispatcher": "quay.io/cdis/ssjdispatcher:2020.11",
"metadata": "quay.io/cdis/metadata-service:2020.11",
"spark": "quay.io/cdis/gen3-spark:2020.11",
"manifestservice": "quay.io/cdis/manifestservice:2020.11",
"wts": "quay.io/cdis/workspace-token-service:2020.11",
"tube": "quay.io/cdis/tube:2020.11",
"guppy": "quay.io/cdis/guppy:2020.11"
"revproxy": "quay.io/cdis/nginx:2021.03",
"sheepdog": "quay.io/cdis/sheepdog:2021.03",
"ssjdispatcher": "quay.io/cdis/ssjdispatcher:2021.03",
"metadata": "quay.io/cdis/metadata-service:2021.03",
"spark": "quay.io/cdis/gen3-spark:2021.03",
"hatchery": "quay.io/cdis/hatchery:2021.03",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"manifestservice": "quay.io/cdis/manifestservice:2021.03",
"wts": "quay.io/cdis/workspace-token-service:2021.03",
"tube": "quay.io/cdis/tube:2021.03",
"guppy": "quay.io/cdis/guppy:2021.03"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -30,7 +32,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "quay.io/cdis/indexs3client:2020.11"
"indexing": "quay.io/cdis/indexs3client:2021.03"
}
},
"global": {
Expand Down
129 changes: 129 additions & 0 deletions qa-heal.planx-pla.net/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"user-namespace": "jupyter-pods-qa-heal",
"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": "qa-heal",
"HOSTNAME": "qa-heal.planx-pla.net"
},
"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 27551a5

Please sign in to comment.