From a126a7254e1a05e9a14fb87535759f1fae45b859 Mon Sep 17 00:00:00 2001 From: Kyle Burton Date: Thu, 6 Feb 2025 10:04:52 -0600 Subject: [PATCH] Updating ACCESS-backend and sheepdog --- .secrets.baseline | 9 +- .../manifest.json | 86 +------------------ 2 files changed, 3 insertions(+), 92 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 0e3c659f60..41625b852a 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -9394,13 +9394,6 @@ "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966", "is_verified": false, "line_number": 98 - }, - { - "type": "Secret Keyword", - "filename": "staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json", - "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865", - "is_verified": false, - "line_number": 208 } ], "staging.midrc.org/manifest.json": [ @@ -9565,5 +9558,5 @@ } ] }, - "generated_at": "2025-01-28T15:39:53Z" + "generated_at": "2025-02-06T16:04:51Z" } diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index d1a18ad0e6..f3e031bf8c 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -7,7 +7,7 @@ "autodeploy": "yes" }, "versions": { - "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2025.01", + "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:1.6.0", "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", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2025.01", @@ -17,7 +17,7 @@ "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine: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", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:5.2.0", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", @@ -169,88 +169,6 @@ } ], "restart_policy": "Never" - }, - { - "name": "manifest-indexing", - "action": "index-object-manifest", - "activeDeadlineSeconds": 86400, - "serviceAccountName": "jobs-staging-gen3-biodatacatalyst-nhlbi-nih-gov", - "container": { - "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2025.01", - "pull_policy": "Always", - "env": [ - { - "name": "GEN3_HOSTNAME", - "valueFrom": { - "configMapKeyRef": { - "name": "manifest-global", - "key": "hostname" - } - } - } - ], - "volumeMounts": [ - { - "name": "sower-jobs-creds-volume", - "readOnly": true, - "mountPath": "/creds.json", - "subPath": "creds.json" - } - ], - "cpu-limit": "1", - "memory-limit": "1Gi" - }, - "volumes": [ - { - "name": "sower-jobs-creds-volume", - "secret": { - "secretName": "sower-jobs-g3auto" - } - } - ], - "restart_policy": "Never" - }, - { - "name": "indexd-manifest", - "action": "download-indexd-manifest", - "activeDeadlineSeconds": 86400, - "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:2025.01", - "pull_policy": "Always", - "env": [ - { - "name": "GEN3_HOSTNAME", - "valueFrom": { - "configMapKeyRef": { - "name": "manifest-global", - "key": "hostname" - } - } - } - ], - "volumeMounts": [ - { - "name": "sower-jobs-creds-volume", - "readOnly": true, - "mountPath": "/creds.json", - "subPath": "creds.json" - } - ], - "cpu-limit": "1", - "memory-limit": "1Gi" - }, - "volumes": [ - { - "name": "sower-jobs-creds-volume", - "secret": { - "secretName": "sower-jobs-g3auto" - } - } - ], - "restart_policy": "Never" } ], "global": {