From a7b13ad9edec8ee6fcbba8d8adecc8ec65bc7337 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:31:55 -0600 Subject: [PATCH 1/5] Gen3 Monthly Release 2024.12 preprod.healdata.org 1733865586 (#8175) * apply version 2024.12 to preprod.healdata.org * apply version 2024.12 to preprod.healdata.org --- preprod.healdata.org/manifest.json | 38 +++++++++---------- .../manifests/hatchery/hatchery.json | 4 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 92d67edcb4..c5439cfd6b 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -8,24 +8,24 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.10", + "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", "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.10", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", + "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", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.35.0", - "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.10", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.10", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.10", + "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", + "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", + "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor: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", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.12", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.12", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.12", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.5", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.6.0" }, @@ -48,7 +48,7 @@ "activeDeadlineSeconds": 600, "container": { "name": "job-task", - "image": "quay.io/cdis/batch-export:feat_GPE-1219", + "image": "quay.io/cdis/batch-export:2024.12", "pull_policy": "Always", "labels": { "internet": "yes" @@ -81,7 +81,7 @@ ], "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.10" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.12" } }, "indexd": { @@ -113,4 +113,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} +} \ No newline at end of file diff --git a/preprod.healdata.org/manifests/hatchery/hatchery.json b/preprod.healdata.org/manifests/hatchery/hatchery.json index b131bd10ac..33eee6c366 100644 --- a/preprod.healdata.org/manifests/hatchery/hatchery.json +++ b/preprod.healdata.org/manifests/hatchery/hatchery.json @@ -9,7 +9,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/ecs-ws-sidecar:2024.10", + "image": "quay.io/cdis/ecs-ws-sidecar:2024.12", "env": { "NAMESPACE": "healpreprod", "GEN3_ENDPOINT": "preprod.healdata.org" @@ -171,4 +171,4 @@ "gen3-volume-location": "/home/jovyan/.gen3" } ] -} +} \ No newline at end of file From e2e82c62c5d99d5c4414a9435e7524a700684993 Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:35:25 -0600 Subject: [PATCH 2/5] Update manifest.json (#8177) --- preprod.healdata.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index c5439cfd6b..0c20085e52 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -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:2024.12", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:feat_karpenter-for-cost", "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", @@ -113,4 +113,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} \ No newline at end of file +} From bae750529e8a7aa32e79a545b28eb241591e740e Mon Sep 17 00:00:00 2001 From: Fan Wang Date: Wed, 11 Dec 2024 10:25:21 -0600 Subject: [PATCH 3/5] Update gitops.json --- va-testing.data-commons.org/portal/gitops.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/va-testing.data-commons.org/portal/gitops.json b/va-testing.data-commons.org/portal/gitops.json index 56b98fac70..dce43d3d47 100644 --- a/va-testing.data-commons.org/portal/gitops.json +++ b/va-testing.data-commons.org/portal/gitops.json @@ -4,7 +4,7 @@ "grafanaFaroEnable": true, "grafanaFaroNamespace": "va-testing" }, - "argoTemplate": "gwas-template-cholesky", + "argoTemplate": "gwas-template-genesisupdate", "graphql": { "boardCounts": [], "chartCounts": [], From 0e444d9f58b9722eb7f3642724259e36121d75c4 Mon Sep 17 00:00:00 2001 From: Fan Wang Date: Wed, 11 Dec 2024 10:31:29 -0600 Subject: [PATCH 4/5] Update manifest and gitops ### Environments va-testingg ### Description of changes - Update argo-wrapper release - Update argo template --- va-testing.data-commons.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index e9a3a2ca17..4912518191 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -9,7 +9,7 @@ "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", - "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.2.6", + "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.2.7", "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.10", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.10", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.7", @@ -62,4 +62,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} \ No newline at end of file +} From 44140b791e21a499302bb3cbab565aeeeab0cea4 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Tue, 10 Dec 2024 13:23:25 -0600 Subject: [PATCH 5/5] Update manifest.json --- va-testing.data-commons.org/manifest.json | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index e9a3a2ca17..f4ba07e7a4 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -8,26 +8,26 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.11", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.2.6", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.10", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.10", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.11", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.11", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.7", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.10", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", + "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", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.10", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", - "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:feat_enable_cohort_characterization", - "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.11.18", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:feat_vadc_sprint23", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.10" + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.11", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.11", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.11", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.11", + "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-2024.12.10", + "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-2024.12.10", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.11", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.36.0", + "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", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.11", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.11" }, "global": { "environment": "va-testing", @@ -47,7 +47,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.10" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.11" } }, "canary": { @@ -62,4 +62,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} \ No newline at end of file +}