From df63e9b2b2a3c60b44c53e8e1fa6f6eba6aab93d Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 9 Jan 2025 09:28:35 -0600 Subject: [PATCH 1/3] apply version 2025.01 to qa-heal.planx-pla.net --- qa-heal.planx-pla.net/manifest.json | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json index 861cabd88..10fe522fd 100644 --- a/qa-heal.planx-pla.net/manifest.json +++ b/qa-heal.planx-pla.net/manifest.json @@ -8,26 +8,26 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "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", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2025.01", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.6.0", - "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", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2025.01", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.5", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:feat_assume-role", - "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", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.12", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.12", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.12" + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2025.01", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2025.01", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01", + "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2025.01", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2025.01", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2025.01", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2025.01" }, "arborist": { "deployment_version": "2" @@ -42,7 +42,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.12" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2025.01" } }, "global": { @@ -76,7 +76,7 @@ "activeDeadlineSeconds": 600, "container": { "name": "job-task", - "image": "quay.io/cdis/batch-export:2024.12", + "image": "quay.io/cdis/batch-export:2025.01", "pull_policy": "Always", "labels": { "internet": "yes" @@ -110,4 +110,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} +} \ No newline at end of file From 0bdb0f1fbc4a62192045095fa95a051bce402476 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 9 Jan 2025 09:28:37 -0600 Subject: [PATCH 2/3] apply version 2025.01 to qa-heal.planx-pla.net --- qa-heal.planx-pla.net/manifests/hatchery/hatchery.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json index def35f954..eb9eb3497 100644 --- a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json @@ -14,7 +14,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/ecs-ws-sidecar:2024.12", + "image": "quay.io/cdis/ecs-ws-sidecar:2025.01", "env": { "NAMESPACE": "qa-heal" }, @@ -188,4 +188,4 @@ "gen3-volume-location": "/home/jovyan/.gen3" } ] -} +} \ No newline at end of file From 576412050c38dd591de30d3379227399ec85be17 Mon Sep 17 00:00:00 2001 From: briennal <111100165+briennal@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:08:38 -0500 Subject: [PATCH 3/3] Update manifest.json Keeping hatchery on feat_assume-role --- qa-heal.planx-pla.net/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json index 10fe522fd..ffeff9638 100644 --- a/qa-heal.planx-pla.net/manifest.json +++ b/qa-heal.planx-pla.net/manifest.json @@ -16,7 +16,7 @@ "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.5", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2025.01", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:feat_assume-role", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2025.01", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01", @@ -110,4 +110,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} \ No newline at end of file +}