Skip to content

Commit

Permalink
Merge pull request #5668 from uc-cdis/chore/promote_preprod_gen3_biod…
Browse files Browse the repository at this point in the history 
…atacatalyst_nhlbi_nih_gov_1675275501

BDCat staging release 1675275499
  • Loading branch information
@SpencerAxelrod
SpencerAxelrod authored Feb 7, 2023
2 parents 50911cf + 21a4f19 commit 4cf0ef4
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 31 deletions.
56 changes: 28 additions & 28 deletions staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
"autodeploy": "yes"
},
"versions": {
"access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2022.10",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.10",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2022.10",
"awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2022.10",
"access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2023.02",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.02",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2023.02",
"awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2023.02",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.10",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.10",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.10",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.10",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.10",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.10",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.10",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.10",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.02",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.02",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.02",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2023.02",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.02",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.02",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.02",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.3.0",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.10",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:0.7.0",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.10",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.10",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.10",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.02",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.02",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.02",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.02",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.02",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.10",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.10",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.10",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.10"
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.02",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.02",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.02",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.02"
},
"google": {
"enabled": "yes"
Expand All @@ -40,7 +40,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.10"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.02"
}
},
"arborist": {
Expand All @@ -52,7 +52,7 @@
"action": "export",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2022.10",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.02",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -117,7 +117,7 @@
"action": "export-files",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2022.10",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.02",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -187,7 +187,7 @@
"serviceAccountName": "jobs-staging-gen3-biodatacatalyst-nhlbi-nih-gov",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.10",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2023.02",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -228,7 +228,7 @@
"serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.10",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2023.02",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -301,9 +301,9 @@
"tier_access_limit": 50,
"dispatcher_job_num": "10",
"netpolicy": "on",
"dd_enabled": null,
"argocd": "true",
"waf_enabled": "true"
"waf_enabled": "true",
"dd_enabled": null
},
"canary": {
"default": 0
Expand Down
2 changes: 1 addition & 1 deletion staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2022.10",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2023.02",
"env": {
"NAMESPACE": "default",
"HOSTNAME": "staging.gen3.biodatacatalyst.nhlbi.nih.gov"
Expand Down
118 changes: 116 additions & 2 deletions staging.gen3.biodatacatalyst.nhlbi.nih.gov/portal/gitops.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,33 @@
"enabled": false,
"text": "Study Discovery"
},
"tagsColumn": {
"enabled": false
},
"tagsInDescription": {
"enabled": true
},
"search": {
"searchBar": {
"enabled": true
},
"tagSearchDropdown": {
"enabled": true,
"collapsibleButtonText": "Study Filters"
}
},
"authorization": {
"enabled": true
"enabled": true,
"supportedValues": {
"accessible": {
"enabled": true,
"menuText": "Accessible"
},
"unaccessible": {
"enabled": true,
"menuText": "Not Accessible"
}
}
}
},
"aggregations": [
Expand All @@ -666,7 +686,8 @@
}
],
"tagSelector": {
"title": "Tags by category"
"title": "Tags by category",
"showTagCategoryNames": true
},
"studyColumns": [
{
Expand All @@ -676,6 +697,8 @@
{
"name": "Full Name",
"field": "full_name",
"errorIfNotAvailable": false,
"valueIfNotAvailable": "",
"contentType": "string"
},
{
Expand All @@ -688,6 +711,12 @@
{
"name": "dbGaP Accession Number",
"field": "study_id"
},
{
"name": "Released",
"field": "released",
"errorIfNotAvailable": false,
"valueIfNotAvailable": "n/a"
}
],
"studyPreviewField": {
Expand Down Expand Up @@ -755,6 +784,91 @@
}
]
},
"detailView": {
"headerField": "project_id",
"tabs": [
{
"tabName": "Study",
"groups": [
{
"header": "Study Information",
"fields": [
{
"type": "text",
"label": "Full Name:",
"sourceField": "full_name",
"default": "Not specified"
},
{
"type": "text",
"label": "Short Name:",
"sourceField": "short_name",
"default": "Not specified"
},
{
"type": "text",
"label": "Number Of Subjects:",
"sourceField": "_subjects_count",
"default": "Not specified"
},
{
"type": "text",
"label": "dbGaP Accession Number:",
"sourceField": "dbgap_accession",
"default": "Not specified"
},
{
"type": "link",
"label": "dbGaP URL:",
"sourceField": "dbgap_url",
"default": "Not specified"
},
{
"type": "text",
"label": "Released:",
"sourceField": "released",
"default": "Not specified"
},
{
"type": "tags"
}
]
},
{
"header": "Study Description",
"fields": [
{
"type": "block",
"sourceField": "study_description"
}
]
}
]
},
{
"tabName": "Access",
"groups": [
{
"fields": [
{
"type": "accessDescriptor"
}
]
},
{
"header": "Study Access",
"fields": [
{
"type": "text",
"sourceField": "study_data_requires_access_request",
"label": "Study Data Requires Access Request"
}
]
}
]
}
]
},
"minimalFieldMapping": {
"tagsListFieldName": "tags",
"authzField": "authz",
Expand Down

0 comments on commit 4cf0ef4

Please sign in to comment.