From 56829dee423d73cc247958cafd3fc00ca3c150df Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:19:28 -0600 Subject: [PATCH 1/4] apply version 2024.12 to healdata.org --- healdata.org/manifest.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 7abf1e2195..a43a448ced 100644 --- a/healdata.org/manifest.json +++ b/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: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", - "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor: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", - "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", + "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor: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", + "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" }, @@ -47,7 +47,7 @@ "activeDeadlineSeconds": 600, "container": { "name": "job-task", - "image": "quay.io/cdis/batch-export:2024.10", + "image": "quay.io/cdis/batch-export:2024.12", "pull_policy": "Always", "labels": { "internet": "yes" @@ -87,7 +87,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": { @@ -119,4 +119,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} +} \ No newline at end of file From c58e2ef369b59352473ac92f3eec7a884ca29cae Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:19:29 -0600 Subject: [PATCH 2/4] apply version 2024.12 to healdata.org --- healdata.org/manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healdata.org/manifests/hatchery/hatchery.json b/healdata.org/manifests/hatchery/hatchery.json index 1af7db3b09..cfa7dedea5 100644 --- a/healdata.org/manifests/hatchery/hatchery.json +++ b/healdata.org/manifests/hatchery/hatchery.json @@ -14,7 +14,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": "default", "GEN3_ENDPOINT": "healdata.org", From bba56457e15b47ef84bb48a9806b781d9c6c6bd2 Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:18:16 -0700 Subject: [PATCH 3/4] Updating Sower Batch Export Job for IRSA --- healdata.org/manifest.json | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index a43a448ced..7e345d5c79 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -44,6 +44,7 @@ { "name": "batch-export", "action": "batch-export", + "serviceAccountName": "batch-export-sa", "activeDeadlineSeconds": 600, "container": { "name": "job-task", @@ -61,27 +62,20 @@ "key": "hostname" } } - } - ], - "volumeMounts": [ + }, { - "name": "batch-export-creds-volume", - "readOnly": true, - "mountPath": "/batch-export-creds.json", - "subPath": "config.json" + "name": "BUCKET" + "valueFrom": { + "configMapKeyRef": { + "name": "batch-export-g3auto", + "key": "bucket_name" + } + } } ], "cpu-limit": "1", "memory-limit": "1Gi" }, - "volumes": [ - { - "name": "batch-export-creds-volume", - "secret": { - "secretName": "batch-export-g3auto" - } - } - ], "restart_policy": "Never" } ], @@ -119,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 7144a292459f8167bbe49bb27e03da34133e9edd Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:24:14 -0700 Subject: [PATCH 4/4] Update manifest.json --- healdata.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 7e345d5c79..16006f7d0d 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -64,7 +64,7 @@ } }, { - "name": "BUCKET" + "name": "BUCKET", "valueFrom": { "configMapKeyRef": { "name": "batch-export-g3auto",