Skip to content

Commit

Permalink
Merge branch 'uc-cdis:master' into chore/pdp-jan-demo-occ
Browse files Browse the repository at this point in the history
  • Loading branch information
urvi-occ authored Jan 23, 2025
2 parents b376b0e + b153e0f commit f9d66a7
Show file tree
Hide file tree
Showing 17 changed files with 427 additions and 166 deletions.
3 changes: 0 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ validatestaging.midrc.org @frankliuao @cgmeyer @uc-cdis/planx-qa
imaging-hub.data-commons.org @frankliuao @cgmeyer @uc-cdis/planx-qa
bihstaging.data-commons.org @frankliuao @cgmeyer @uc-cdis/planx-qa

gen3.theanvil.io @radhrreddy @uc-cdis/planx-qa
internalstaging.theanvil.io @radhrreddy @uc-cdis/planx-qa

gen3.biodatacatalyst.nhlbi.nih.gov @radhrreddy @uc-cdis/planx-qa
preprod.gen3.biodatacatalyst.nhlbi.nih.gov @radhrreddy @uc-cdis/planx-qa
staging.gen3.biodatacatalyst.nhlbi.nih.gov @radhrreddy @uc-cdis/planx-qa
Expand Down
32 changes: 16 additions & 16 deletions bihstaging.data-commons.org/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.12",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01",
"aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.12",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.12",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2025.01",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"frontend-framework": "quay.io/cdis/bih-data-commons:1.1.0",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.12",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.12",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.12",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.12",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.12",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.12",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.12",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.12",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.12",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.12",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.12"
"frontend-framework": "quay.io/cdis/bih-data-commons:chore_update_config",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2025.01",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2025.01",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2025.01",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2025.01",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2025.01"
},
"arborist": {
"deployment_version": "2"
Expand Down Expand Up @@ -102,4 +102,4 @@
"targetCpu": 40
}
}
}
}
30 changes: 18 additions & 12 deletions healdata.org/manifests/hatchery/hatchery.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,19 @@
"cpu-limit": "1.0",
"memory-limit": "2Gi",
"name": "(Generic, User-licensed) Stata Notebook ",
"image": "quay.io/cdis/jupyter-pystata-user-licensed:1.2.0",
"image": "quay.io/cdis/jupyter-pystata-user-licensed:2.0.0",
"env": {
"FRAME_ANCESTORS": "https://healdata.org"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.shutdown_no_activity_timeout=5400",
"--NotebookApp.quit_button=False"
"--JupyterNotebookApp.base_url=/lw-workspace/proxy/",
"--JupyterNotebookApp.default_url=/lab",
"--JupyterNotebookApp.password=''",
"--JupyterNotebookApp.token=''",
"--JupyterNotebookApp.ip='*'",
"--JupyterNotebookApp.notebook_dir='/home/jovyan'",
"--JupyterNotebookApp.shutdown_no_activity_timeout=3600",
"--JupyterNotebookApp.quit_button=False"
],
"command": [
"start-notebook.sh"
Expand All @@ -107,7 +110,7 @@
"cpu-limit": "1.0",
"memory-limit": "2Gi",
"name": "(Generic, Limited Gen3-licensed) Stata Notebook",
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:1.3.3",
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:2.0.0",
"env": {
"FRAME_ANCESTORS": "https://healdata.org"
},
Expand All @@ -121,11 +124,14 @@
"workspace-flavor": "gen3-licensed"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.shutdown_no_activity_timeout=5400",
"--NotebookApp.quit_button=False"
"--JupyterNotebookApp.base_url=/lw-workspace/proxy/",
"--JupyterNotebookApp.default_url=/lab",
"--JupyterNotebookApp.password=''",
"--JupyterNotebookApp.token=''",
"--JupyterNotebookApp.ip='*'",
"--JupyterNotebookApp.notebook_dir='/home/jovyan'",
"--JupyterNotebookApp.shutdown_no_activity_timeout=3600",
"--JupyterNotebookApp.quit_button=False"
],
"command": [
"/bin/bash",
Expand Down
26 changes: 13 additions & 13 deletions icgc.bionimbus.org/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.11",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01",
"aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.11",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.11",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.11",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.11",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.11",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.11",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.11",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2025.01",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.11",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.11",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.11",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.11"
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2025.01",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2025.01",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2025.01",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2025.01"
},
"google": {
"enabled": "no"
Expand Down Expand Up @@ -70,7 +70,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.11"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2025.01"
}
}
}
32 changes: 16 additions & 16 deletions nci-crdc-staging.datacommons.io/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.12",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.12",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2025.01",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.12",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2025.01",
"datareplicate": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/dcf-dataservice:2023.09",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.12",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"google-sa-validation": "placeholder:2024.12",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.12",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.12",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.12",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.12",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.12",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.12",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.12",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.12"
"google-sa-validation": "placeholder:2025.01",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2025.01",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2025.01"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -42,7 +42,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.12"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2025.01"
}
},
"sower": [
Expand All @@ -53,7 +53,7 @@
"serviceAccountName": "jobs-nci-crdc-staging-datacommons-io",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.12",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -94,7 +94,7 @@
"serviceAccountName": "jobs-nci-crdc-staging-datacommons-io",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.12",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down
1 change: 1 addition & 0 deletions nci-crdc.datacommons.io/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
"dispatcher_job_num": "10",
"argocd": "true",
"pdb": "on",
"indexd_single_table": "true",
"waf_enabled": "true"
},
"canary": {
Expand Down
2 changes: 1 addition & 1 deletion preprod.healdata.org/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.12",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.12",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:feat_karpenter-for-cost",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.12",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.12",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.12",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.12",
Expand Down
39 changes: 25 additions & 14 deletions preprod.healdata.org/manifests/hatchery/hatchery.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
"sub-dir": "/lw-workspace",
"user-volume-size": "10Gi",
"pay-models-dynamodb-table": "bmh-admin-portal-backend-bmhworkspacetableD4D73E43-1SZM8FA8IP6F",
"karpenter": true,
"default-pay-model": {
"bmh_workspace_id": "blanket_billing_eks",
"region": "us-east-1",
"account_id": "252835817747",
"workspace_type": "healworkspaces"
},
"license-user-maps-dynamodb-table": "gen3-license-user-maps-preprod-heal",
"license-user-maps-global-secondary-index": "activeUsersIndex",
"sidecar": {
Expand Down Expand Up @@ -69,16 +74,19 @@
"cpu-limit": "1.0",
"memory-limit": "2Gi",
"name": "(Generic, User-licensed) Stata Notebook ",
"image": "quay.io/cdis/jupyter-pystata-user-licensed:1.2.0",
"image": "quay.io/cdis/jupyter-pystata-user-licensed:2.0.0",
"env": {
"FRAME_ANCESTORS": "https://preprod.healdata.org"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.shutdown_no_activity_timeout=5400",
"--NotebookApp.quit_button=False"
"--JupyterNotebookApp.base_url=/lw-workspace/proxy/",
"--JupyterNotebookApp.default_url=/lab",
"--JupyterNotebookApp.password=''",
"--JupyterNotebookApp.token=''",
"--JupyterNotebookApp.ip='*'",
"--JupyterNotebookApp.notebook_dir='/home/jovyan'",
"--JupyterNotebookApp.shutdown_no_activity_timeout=3600",
"--JupyterNotebookApp.quit_button=False"
],
"command": [
"start-notebook.sh"
Expand All @@ -100,7 +108,7 @@
"cpu-limit": "1.0",
"memory-limit": "2Gi",
"name": "(Generic, Limited Gen3-licensed) Stata Notebook",
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:1.3.3",
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:2.0.0",
"env": {
"FRAME_ANCESTORS": "https://preprod.healdata.org"
},
Expand All @@ -114,11 +122,14 @@
"workspace-flavor": "gen3-licensed"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.shutdown_no_activity_timeout=5400",
"--NotebookApp.quit_button=False"
"--JupyterNotebookApp.base_url=/lw-workspace/proxy/",
"--JupyterNotebookApp.default_url=/lab",
"--JupyterNotebookApp.password=''",
"--JupyterNotebookApp.token=''",
"--JupyterNotebookApp.ip='*'",
"--JupyterNotebookApp.notebook_dir='/home/jovyan'",
"--JupyterNotebookApp.shutdown_no_activity_timeout=3600",
"--JupyterNotebookApp.quit_button=False"
],
"command": [
"/bin/bash",
Expand Down Expand Up @@ -173,4 +184,4 @@
"gen3-volume-location": "/home/jovyan/.gen3"
}
]
}
}
2 changes: 1 addition & 1 deletion prometheus.data-commons.org/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"environment": "pdp-commons",
"hostname": "prometheus.data-commons.org",
"revproxy_arn": "arn:aws:acm:us-east-1:851725307933:certificate/94dc6b22-6ad2-481f-aff5-59ad7381e9c6",
"dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/pdp_dictionary/0.0.3/schema.json",
"dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/pdp_dictionary/0.0.5/schema.json",
"dispatcher_job_num": "10",
"portal_app": "gitops",
"sync_from_dbgap": "False",
Expand Down
68 changes: 68 additions & 0 deletions prometheus.data-commons.org/manifests/hatchery/hatchery.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"user-namespace": "jupyter-pods",
"sub-dir": "/lw-workspace",
"user-volume-size": "10Gi",
"default-pay-model": {
"workspace_type": "Trial Workspace",
"local": true
},
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "quay.io/cdis/ecs-ws-sidecar:2024.08",
"env": {
"NAMESPACE": "default",
"HOSTNAME": "prometheus.data-commons.org"
},
"args": [],
"command": [
"/bin/bash",
"./sidecar.sh"
],
"lifecycle-pre-stop": [
"su",
"-c",
"echo test",
"-s",
"/bin/sh",
"root"
]
},
"containers": [
{
"target-port": 8888,
"cpu-limit": "2.0",
"memory-limit": "8Gi",
"name": "(Generic) Jupyter Lab Notebook with R Kernel",
"image": "quay.io/cdis/brh-notebooks:generic_rkernel__cde777374d413c9ca93e582fd31c39952d5a22f6",
"env": {
"FRAME_ANCESTORS": "https://prometheus.data-commons.org"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.default_url=/lab",
"--NotebookApp.password=''",
"--NotebookApp.token=''",
"--NotebookApp.ip='*'",
"--NotebookApp.notebook_dir='/home/jovyan'",
"--NotebookApp.shutdown_no_activity_timeout=5400",
"--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; rm -rf /home/$IAM/pd/lost+found; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100,
"user-volume-location": "/home/jovyan/pd",
"gen3-volume-location": "/home/jovyan/.gen3"
}
]
}
Loading

0 comments on commit f9d66a7

Please sign in to comment.