From d87b2323204b3326d20f890d143f010bb73f9c8f Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 29 Nov 2023 16:02:37 -0700 Subject: [PATCH 1/2] Updating Jcoin to release 2023.12 in preparation for ES7 changes. --- .secrets.baseline | 4 +-- jcoin.datacommons.io/manifest.json | 43 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 71fe3b66cd..9e1301f8c6 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -7792,7 +7792,7 @@ "filename": "jcoin.datacommons.io/manifest.json", "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865", "is_verified": false, - "line_number": 163 + "line_number": 164 } ], "nci-crdc-staging.datacommons.io/dashboard/Secure/reports/modules/jasmine-core/package.json": [ @@ -9624,5 +9624,5 @@ } ] }, - "generated_at": "2023-11-21T20:06:51Z" + "generated_at": "2023-11-29T23:02:33Z" } diff --git a/jcoin.datacommons.io/manifest.json b/jcoin.datacommons.io/manifest.json index ec0aaafd83..459b42e023 100644 --- a/jcoin.datacommons.io/manifest.json +++ b/jcoin.datacommons.io/manifest.json @@ -4,28 +4,28 @@ "That's all I have to say" ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.05", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "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.05", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.05", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.05", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.05", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2023.12", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12", + "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:3.2.1", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.05", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.05", + "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:5.13.0", "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:0.7.5", "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:0.16.1", "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.05", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.05", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.05", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.05", + "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", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.05", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.05", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.05" + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.12", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.12", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.12" }, "indexd": { "arborist": "true" @@ -45,7 +45,8 @@ "maintenance_mode": "off", "argocd": "true", "pdb": "on", - "waf_enabled": "true" + "waf_enabled": "true", + "es7": true }, "canary": { "default": 0 @@ -121,7 +122,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.05" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.12" } }, "sower": [ @@ -132,7 +133,7 @@ "serviceAccountName": "jobs-jcoin-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2023.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2023.12", "pull_policy": "Always", "env": [ { @@ -172,7 +173,7 @@ "serviceAccountName": "jobs-jcoin-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2023.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2023.12", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -203,7 +204,7 @@ "serviceAccountName": "jobs-jcoin-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2023.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2023.12", "pull_policy": "Always", "env": [ { @@ -244,7 +245,7 @@ "serviceAccountName": "jobs-jcoin-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2023.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2023.12", "pull_policy": "Always", "env": [ { @@ -285,7 +286,7 @@ "serviceAccountName": "jobs-jcoin-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2023.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2023.12", "pull_policy": "Always", "env": [ { From 03c38a710187ce381028d911f1fa502ea1201236 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 1 Dec 2023 08:14:36 -0700 Subject: [PATCH 2/2] updating tube and guppy versions --- jcoin.datacommons.io/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jcoin.datacommons.io/manifest.json b/jcoin.datacommons.io/manifest.json index 459b42e023..ee6d60c112 100644 --- a/jcoin.datacommons.io/manifest.json +++ b/jcoin.datacommons.io/manifest.json @@ -15,8 +15,8 @@ "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:5.13.0", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:0.7.5", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:0.16.1", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.12", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy: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.12", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12",