From 15f81da4e3acd7475ad258af2b89c27322b492e3 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:07:09 -0600 Subject: [PATCH 1/3] apply version 2022.03 to dataguids.org --- dataguids.org/manifest.json | 419 ++++++++++++++++++++---------------- 1 file changed, 234 insertions(+), 185 deletions(-) diff --git a/dataguids.org/manifest.json b/dataguids.org/manifest.json index fef1e55d23..b4b8af3ad3 100644 --- a/dataguids.org/manifest.json +++ b/dataguids.org/manifest.json @@ -1,186 +1,235 @@ { - "notes": [ - "This is the dev environment manifest ", - "That's all I have to say" - ], - "jenkins": { - "autodeploy": "yes" - }, - "versions": { - "indexd": "quay.io/cdis/indexd:2021.04", - "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "portal": "quay.io/cdis/dataguids:1.0.1", - "metadata": "quay.io/cdis/metadata-service:2021.06", - "revproxy": "quay.io/cdis/nginx:2021.04" - }, - "jupyterhub": { - "enabled": "no" - }, - "global": { - "environment": "dataguids", - "hostname": "dataguids.org", - "revproxy_arn": "arn:aws:acm:us-east-1:895962626746:certificate/742b0502-bcd6-45b9-8a18-921560be4432", - "dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json", - "portal_app": "dev", - "kube_bucket": "kube-dataguids-gen3", - "logs_bucket": "logs-dataguids-gen3", - "sync_from_dbgap": "False", - "useryaml_s3path": "s3://cdis-gen3-users/dataguids/user.yaml" - }, - "canary": { - "default": 0 - }, - "indexd": { - "dist": [{ - "name": "DataSTAGE", - "host": "https://gen3.biodatacatalyst.nhlbi.nih.gov/index/", - "hints": [".*dg\\.4503.*"], - "type": "indexd" - }, - { - "name": "OCC Environmental DC", - "host": "https://portal.occ-data.org/index/", - "hints": [".*dg\\.7C5B.*"], - "type": "indexd" - }, - { - "name": "Kids First", - "host": "https://data.kidsfirstdrc.org/index/", - "hints": [".*dg\\.F82A1A.*"], - "type": "indexd" - }, - { - "name": "VA Data", - "host": "https://va.data-commons.org/index/", - "hints": [".*dg\\.F738.*"], - "type": "indexd" - }, - { - "name": "NCI CRDC", - "host": "https://nci-crdc.datacommons.io/index/", - "hints": [], - "type": "indexd" - }, - { - "name": "AnVIL", - "host": "https://gen3.theanvil.io/index/", - "hints": [".*dg\\.ANV0.*"], - "type": "indexd" - }, - { - "name": "JCOIN", - "host": "https://jcoin.datacommons.io/index/", - "hints": [".*dg\\.6VTS.*"], - "type": "indexd" - }, - { - "name": "HEAL", - "host": "https://healdata.org/index/", - "hints": [".*dg\\.H34L.*"], - "type": "indexd" - }, - { - "name": "External Data HEAL", - "host": "https://externaldata.healdata.org/index/", - "hints": [".*dg\\.H35L.*"], - "type": "indexd" - }, - { - "name": "Genomics Aotearoa Data", - "host": "https://repo.data.nesi.org.nz/index/", - "hints": [".*dg\\.GAD88.*"], - "type": "indexd" - }, - { - "name": "GAD", - "host": "https://data.agdr.org.nz/index/", - "hints": [".*dg\\.GAD89.*"], - "type": "indexd" - }, - { - "name": "UMCCR AGHA", - "host": "https://gen3.agha.umccr.org/index/", - "hints": [".*dg\\.UM33R90.*"], - "type": "indexd" - }, - { - "name": "Accessclinicaldata", - "host": "https://accessclinicaldata.niaid.nih.gov/index/", - "hints": [".*dg\\.NACD.*"], - "type": "indexd" - }, - { - "name": "AcctBionimbus", - "host": "https://acct.bionimbus.org/index/", - "hints": [".*dg\\.4825.*"], - "type": "indexd" - }, - { - "name": "Genomeldata", - "host": "https://genomel.bionimbus.org/index/", - "hints": [".*dg\\.80B6.*"], - "type": "indexd" - }, - { - "name": "ibdgcdata", - "host": "https://ibdgc.datacommons.io/index/", - "hints": [".*dg\\.EA80.*"], - "type": "indexd" - }, - { - "name": "Stageprod", - "host": "https://gen3.biodatacatalyst.nhlbi.nih.gov/index/", - "hints": [".*dg\\.4503.*"], - "type": "indexd" - }, - { - "name": "occ-edc", - "host": "https://portal.occ-data.org/index/", - "hints": [".*dg\\.7C5B.*"], - "type": "indexd" - }, - { - "name": "Stagingdatastage", - "host": "https://staging.gen3.biodatacatalyst.nhlbi.nih.gov/index/", - "hints": [".*dg\\.712C.*"], - "type": "indexd" - }, - { - "name": "PRC", - "host": "http://chicagoland.pandemicresponsecommons.org/index/", - "hints": [".*dg\\.63D5.*"], - "type": "indexd" - }, - { - "name": "MIDRC", - "host": "https://data.midrc.org/index/", - "hints": [".*dg\\.MD1R.*"], - "type": "indexd" - }, - { - "name": "NCI CRDC", - "host": "https://nci-crdc.datacommons.io/index/", - "hints": [".*dg\\.NCI35.*"], - "type": "indexd" - }, - { - "name": "Canine", - "host": "https://caninedc.org/index/", - "hints": [".*dg\\.C78ne.*"], - "type": "indexd" - }, - { - "name": "VPO", - "host": "https://vpodc.data-commons.org/login/index/", - "hints": [".*dg\\.VP07.*"], - "type": "indexd" - }, - { - "name": "BloodPAC", - "host": "https://data.bloodpac.org/index/", - "hints": [".*dg\\.5B0D.*"], - "type": "indexd" - } - ] - } -} + "notes": [ + "This is the dev environment manifest ", + "That's all I have to say" + ], + "jenkins": { + "autodeploy": "yes" + }, + "versions": { + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.03", + "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.03", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.03", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.03" + }, + "jupyterhub": { + "enabled": "no" + }, + "global": { + "environment": "dataguids", + "hostname": "dataguids.org", + "revproxy_arn": "arn:aws:acm:us-east-1:895962626746:certificate/742b0502-bcd6-45b9-8a18-921560be4432", + "dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json", + "portal_app": "dev", + "kube_bucket": "kube-dataguids-gen3", + "logs_bucket": "logs-dataguids-gen3", + "sync_from_dbgap": "False", + "useryaml_s3path": "s3://cdis-gen3-users/dataguids/user.yaml" + }, + "canary": { + "default": 0 + }, + "indexd": { + "dist": [ + { + "name": "DataSTAGE", + "host": "https://gen3.biodatacatalyst.nhlbi.nih.gov/index/", + "hints": [ + ".*dg\\.4503.*" + ], + "type": "indexd" + }, + { + "name": "OCC Environmental DC", + "host": "https://portal.occ-data.org/index/", + "hints": [ + ".*dg\\.7C5B.*" + ], + "type": "indexd" + }, + { + "name": "Kids First", + "host": "https://data.kidsfirstdrc.org/index/", + "hints": [ + ".*dg\\.F82A1A.*" + ], + "type": "indexd" + }, + { + "name": "VA Data", + "host": "https://va.data-commons.org/index/", + "hints": [ + ".*dg\\.F738.*" + ], + "type": "indexd" + }, + { + "name": "NCI CRDC", + "host": "https://nci-crdc.datacommons.io/index/", + "hints": [], + "type": "indexd" + }, + { + "name": "AnVIL", + "host": "https://gen3.theanvil.io/index/", + "hints": [ + ".*dg\\.ANV0.*" + ], + "type": "indexd" + }, + { + "name": "JCOIN", + "host": "https://jcoin.datacommons.io/index/", + "hints": [ + ".*dg\\.6VTS.*" + ], + "type": "indexd" + }, + { + "name": "HEAL", + "host": "https://healdata.org/index/", + "hints": [ + ".*dg\\.H34L.*" + ], + "type": "indexd" + }, + { + "name": "External Data HEAL", + "host": "https://externaldata.healdata.org/index/", + "hints": [ + ".*dg\\.H35L.*" + ], + "type": "indexd" + }, + { + "name": "Genomics Aotearoa Data", + "host": "https://repo.data.nesi.org.nz/index/", + "hints": [ + ".*dg\\.GAD88.*" + ], + "type": "indexd" + }, + { + "name": "GAD", + "host": "https://data.agdr.org.nz/index/", + "hints": [ + ".*dg\\.GAD89.*" + ], + "type": "indexd" + }, + { + "name": "UMCCR AGHA", + "host": "https://gen3.agha.umccr.org/index/", + "hints": [ + ".*dg\\.UM33R90.*" + ], + "type": "indexd" + }, + { + "name": "Accessclinicaldata", + "host": "https://accessclinicaldata.niaid.nih.gov/index/", + "hints": [ + ".*dg\\.NACD.*" + ], + "type": "indexd" + }, + { + "name": "AcctBionimbus", + "host": "https://acct.bionimbus.org/index/", + "hints": [ + ".*dg\\.4825.*" + ], + "type": "indexd" + }, + { + "name": "Genomeldata", + "host": "https://genomel.bionimbus.org/index/", + "hints": [ + ".*dg\\.80B6.*" + ], + "type": "indexd" + }, + { + "name": "ibdgcdata", + "host": "https://ibdgc.datacommons.io/index/", + "hints": [ + ".*dg\\.EA80.*" + ], + "type": "indexd" + }, + { + "name": "Stageprod", + "host": "https://gen3.biodatacatalyst.nhlbi.nih.gov/index/", + "hints": [ + ".*dg\\.4503.*" + ], + "type": "indexd" + }, + { + "name": "occ-edc", + "host": "https://portal.occ-data.org/index/", + "hints": [ + ".*dg\\.7C5B.*" + ], + "type": "indexd" + }, + { + "name": "Stagingdatastage", + "host": "https://staging.gen3.biodatacatalyst.nhlbi.nih.gov/index/", + "hints": [ + ".*dg\\.712C.*" + ], + "type": "indexd" + }, + { + "name": "PRC", + "host": "http://chicagoland.pandemicresponsecommons.org/index/", + "hints": [ + ".*dg\\.63D5.*" + ], + "type": "indexd" + }, + { + "name": "MIDRC", + "host": "https://data.midrc.org/index/", + "hints": [ + ".*dg\\.MD1R.*" + ], + "type": "indexd" + }, + { + "name": "NCI CRDC", + "host": "https://nci-crdc.datacommons.io/index/", + "hints": [ + ".*dg\\.NCI35.*" + ], + "type": "indexd" + }, + { + "name": "Canine", + "host": "https://caninedc.org/index/", + "hints": [ + ".*dg\\.C78ne.*" + ], + "type": "indexd" + }, + { + "name": "VPO", + "host": "https://vpodc.data-commons.org/login/index/", + "hints": [ + ".*dg\\.VP07.*" + ], + "type": "indexd" + }, + { + "name": "BloodPAC", + "host": "https://data.bloodpac.org/index/", + "hints": [ + ".*dg\\.5B0D.*" + ], + "type": "indexd" + } + ] + } +} \ No newline at end of file From 1755b0c49492a6e08eef62f271270652a8a9c623 Mon Sep 17 00:00:00 2001 From: Atharva Rane <41084525+atharvar28@users.noreply.github.com> Date: Mon, 7 Mar 2022 14:58:28 -0500 Subject: [PATCH 2/3] reverting back the portal version --- dataguids.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataguids.org/manifest.json b/dataguids.org/manifest.json index b4b8af3ad3..c09ad8bae9 100644 --- a/dataguids.org/manifest.json +++ b/dataguids.org/manifest.json @@ -9,7 +9,7 @@ "versions": { "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.03", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.03", + "portal": "quay.io/cdis/dataguids:1.0.1", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.03", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.03" }, @@ -232,4 +232,4 @@ } ] } -} \ No newline at end of file +} From 8feb9bc67f47c2d709f58b1546eeb730f890ce8c Mon Sep 17 00:00:00 2001 From: Atharva Rane <41084525+atharvar28@users.noreply.github.com> Date: Mon, 7 Mar 2022 17:06:16 -0500 Subject: [PATCH 3/3] update portal to use ECR path --- dataguids.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataguids.org/manifest.json b/dataguids.org/manifest.json index c09ad8bae9..afbb568c70 100644 --- a/dataguids.org/manifest.json +++ b/dataguids.org/manifest.json @@ -9,7 +9,7 @@ "versions": { "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.03", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "portal": "quay.io/cdis/dataguids:1.0.1", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/dataguids:2022.03", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.03", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.03" },