From d24bfde7ec0fe2eab6c8f243745c49d62497432d Mon Sep 17 00:00:00 2001 From: divyaocc <89143700+divyaocc@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:44:16 -0500 Subject: [PATCH 1/3] updating_version_2022.08 this is final PR to update version to 2022.08 in microservices in manifest.json --- data.bloodpac.org/manifest.json | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/data.bloodpac.org/manifest.json b/data.bloodpac.org/manifest.json index 5ccfd1a45c..7de9727a9b 100644 --- a/data.bloodpac.org/manifest.json +++ b/data.bloodpac.org/manifest.json @@ -4,35 +4,35 @@ "That's all I have to say." ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.05", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.05", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.05", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.05", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.05", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.05", - "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.05", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.05", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.05", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.05", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.08", + "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "jupyterhub": "quay.io/occ_data/jupyterhub:2022.05", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.05", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.05", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.05", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.05", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.05", + "jupyterhub": "quay.io/occ_data/jupyterhub:2022.08", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.08", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.08", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.05", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.05", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.05" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.08" }, "indexd": { "arborist": "true" }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.05" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.08" } }, "arborist": { @@ -46,7 +46,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2022.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2022.08", "pull_policy": "Always", "env": [ { @@ -86,7 +86,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2022.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2022.08", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -117,7 +117,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.08", "pull_policy": "Always", "env": [ { @@ -158,7 +158,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2022.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2022.08", "pull_policy": "Always", "env": [ { @@ -199,7 +199,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.05", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.08", "pull_policy": "Always", "env": [ { From ca16aecb08c16f38b99ab1b608f12ad54308e3f4 Mon Sep 17 00:00:00 2001 From: divyaocc <89143700+divyaocc@users.noreply.github.com> Date: Tue, 23 Aug 2022 11:50:00 -0500 Subject: [PATCH 2/3] updating from 2022-05 to 2022-07 making another minor change to 2022.07 in manifest.json --- data.bloodpac.org/manifest.json | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/data.bloodpac.org/manifest.json b/data.bloodpac.org/manifest.json index 7de9727a9b..5b8494b2f1 100644 --- a/data.bloodpac.org/manifest.json +++ b/data.bloodpac.org/manifest.json @@ -4,35 +4,35 @@ "That's all I have to say." ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.08", - "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.08", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.08", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.08", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.08", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.08", - "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.08", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.08", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.07", + "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.7", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.07", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.07", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.07", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.07", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.07", + "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.07", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.07", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.07", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.07", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "jupyterhub": "quay.io/occ_data/jupyterhub:2022.08", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.08", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.08", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.08", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.08", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.08", + "jupyterhub": "quay.io/occ_data/jupyterhub:2022.07", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.07", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.07", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.07", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.07", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.07", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.08", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.08", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.08" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.07", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.07", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.07" }, "indexd": { "arborist": "true" }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.08" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.07" } }, "arborist": { @@ -46,7 +46,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2022.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2022.07", "pull_policy": "Always", "env": [ { @@ -86,7 +86,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2022.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2022.07", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -117,7 +117,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.07", "pull_policy": "Always", "env": [ { @@ -158,7 +158,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2022.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2022.07", "pull_policy": "Always", "env": [ { @@ -199,7 +199,7 @@ "serviceAccountName": "jobs-data-bloodpac-org", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.07", "pull_policy": "Always", "env": [ { From 30cdf7f0bb2d68777636b42c4c5b539093e7e60c Mon Sep 17 00:00:00 2001 From: divyaocc <89143700+divyaocc@users.noreply.github.com> Date: Wed, 24 Aug 2022 16:01:04 -0500 Subject: [PATCH 3/3] Going back to 0.8 for aws-es-proxy As jenkins CI is failing, I changed the version from 0.7 to 0.8 for aws-es-proxy. --- data.bloodpac.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.bloodpac.org/manifest.json b/data.bloodpac.org/manifest.json index 5b8494b2f1..a439cc0eaa 100644 --- a/data.bloodpac.org/manifest.json +++ b/data.bloodpac.org/manifest.json @@ -5,7 +5,7 @@ ], "versions": { "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.07", - "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.7", + "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.07", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.07",