From eec6eec4a60a743d2c93275608672958a7ed0552 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 8 Dec 2023 14:35:23 -0700 Subject: [PATCH 1/3] Updating covid19prod to release 2023.12 in preparation for ES7 changes. --- .../manifest.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/chicagoland.pandemicresponsecommons.org/manifest.json b/chicagoland.pandemicresponsecommons.org/manifest.json index 5d879973bc..72b8c75512 100644 --- a/chicagoland.pandemicresponsecommons.org/manifest.json +++ b/chicagoland.pandemicresponsecommons.org/manifest.json @@ -4,32 +4,32 @@ "That's all I have to say" ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.10", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2023.10", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2023.10", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2023.12", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2023.12", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:5.2.4", "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:5.1.6", "covid19-bayes": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-bayes:5.1.4", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.10", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.10", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.10", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.10", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.10", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.10", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.12", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.12", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.12", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.12", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.12", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.10", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.10", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.10", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.10", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.12", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.12", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.12", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.10", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.10", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.10", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.12", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12", "auspice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-auspice:v2.25.gen3.2.15", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.10", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.10" + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.12", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.12" }, "global": { "environment": "covid19-prod", @@ -129,7 +129,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.10" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.12" } }, "sower": [ @@ -138,7 +138,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.12", "pull_policy": "Always", "env": [ { From 16ed10b25958bdbeece7088777d50e557f6c8788 Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Tue, 12 Dec 2023 08:24:27 -0700 Subject: [PATCH 2/3] adding global "es7" tag --- chicagoland.pandemicresponsecommons.org/manifest.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chicagoland.pandemicresponsecommons.org/manifest.json b/chicagoland.pandemicresponsecommons.org/manifest.json index 72b8c75512..1ec8d958d9 100644 --- a/chicagoland.pandemicresponsecommons.org/manifest.json +++ b/chicagoland.pandemicresponsecommons.org/manifest.json @@ -51,7 +51,8 @@ "argocd": "true", "waf_enabled": "true", "pdb": "on", - "karpenter": true + "karpenter": true, + "es7": true }, "portal": { "GEN3_BUNDLE": "covid19" @@ -236,4 +237,4 @@ "config_index": "covid19_array-config", "auth_filter_field": "auth_resource_path" } -} \ No newline at end of file +} From 4b26163edba84fd9dda6eecce5ed6fe0a0e305d7 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Mon, 8 Jan 2024 15:04:32 -0700 Subject: [PATCH 3/3] updating fuse-sidecar image to 2023.12 image to match the current release --- .../manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chicagoland.pandemicresponsecommons.org/manifests/hatchery/hatchery.json b/chicagoland.pandemicresponsecommons.org/manifests/hatchery/hatchery.json index ebef39abc6..48d2d22a35 100644 --- a/chicagoland.pandemicresponsecommons.org/manifests/hatchery/hatchery.json +++ b/chicagoland.pandemicresponsecommons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2023.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2023.13", "env": { "NAMESPACE": "default", "HOSTNAME": "chicagoland.pandemicresponsecommons.org"