diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 7abf1e2195..16006f7d0d 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" }, @@ -44,10 +44,11 @@ { "name": "batch-export", "action": "batch-export", + "serviceAccountName": "batch-export-sa", "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" @@ -61,33 +62,26 @@ "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" } ], "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": { 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",