From 676f613998e6e5908bfce7c7c2bb87c9f5d44f1c Mon Sep 17 00:00:00 2001 From: Marcelo R Costa Date: Thu, 2 Jul 2020 12:12:56 -0500 Subject: [PATCH 1/4] apply version 2020.07 to preprod.gen3.biodatacatalyst.nhlbi.nih.gov --- .../manifest.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index e3dd82d338..451f5b634f 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -7,35 +7,35 @@ "autodeploy": "yes" }, "versions": { - "arborist": "quay.io/cdis/arborist:2020.06", + "arborist": "quay.io/cdis/arborist:2020.07", "aws-es-proxy": "abutaha/aws-es-proxy:0.8", - "fence": "quay.io/cdis/fence:2020.06", - "indexd": "quay.io/cdis/indexd:2020.06", - "peregrine": "quay.io/cdis/peregrine:2020.06", - "pidgin": "quay.io/cdis/pidgin:2020.06", - "revproxy": "quay.io/cdis/nginx:2020.06", - "sheepdog": "quay.io/cdis/sheepdog:2020.06", - "metadata": "quay.io/cdis/metadata-service:2020.06", - "portal": "quay.io/cdis/data-portal:2.30.0", + "fence": "quay.io/cdis/fence:2020.07", + "indexd": "quay.io/cdis/indexd:2020.07", + "peregrine": "quay.io/cdis/peregrine:2020.07", + "pidgin": "quay.io/cdis/pidgin:2020.07", + "revproxy": "quay.io/cdis/nginx:2020.07", + "sheepdog": "quay.io/cdis/sheepdog:2020.07", + "metadata": "quay.io/cdis/metadata-service:2020.07", + "portal": "quay.io/cdis/data-portal:2020.07", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "spark": "quay.io/cdis/gen3-spark:2020.06", - "tube": "quay.io/cdis/tube:2020.06", - "guppy": "quay.io/cdis/guppy:2020.06", - "sower": "quay.io/cdis/sower:2020.06", - "hatchery": "quay.io/cdis/hatchery:2020.06", + "spark": "quay.io/cdis/gen3-spark:2020.07", + "tube": "quay.io/cdis/tube:2020.07", + "guppy": "quay.io/cdis/guppy:2020.07", + "sower": "quay.io/cdis/sower:2020.07", + "hatchery": "quay.io/cdis/hatchery:2020.07", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "quay.io/cdis/workspace-token-service:2020.06", - "manifestservice": "quay.io/cdis/manifestservice:2020.06", - "data-ingestion-pipeline": "quay.io/cdis/bdcat-data-ingestion:1.1", - "ssjdispatcher": "quay.io/cdis/ssjdispatcher:2020.06", - "dashboard": "quay.io/cdis/gen3-statics:1.0.0" + "wts": "quay.io/cdis/workspace-token-service:2020.07", + "manifestservice": "quay.io/cdis/manifestservice:2020.07", + "data-ingestion-pipeline": "quay.io/cdis/bdcat-data-ingestion:2020.07", + "ssjdispatcher": "quay.io/cdis/ssjdispatcher:2020.07", + "dashboard": "quay.io/cdis/gen3-statics:2020.07" }, "google": { "enabled": "yes" }, "ssjdispatcher": { "job_images": { - "indexing": "quay.io/cdis/indexs3client:2020.06" + "indexing": "quay.io/cdis/indexs3client:2020.07" } }, "arborist": { @@ -47,7 +47,7 @@ "action": "export", "container": { "name": "job-task", - "image": "quay.io/cdis/pelican-export:2020.06", + "image": "quay.io/cdis/pelican-export:2020.07", "pull_policy": "Always", "env": [ { @@ -378,4 +378,4 @@ "targetCpu": 40 } } -} +} \ No newline at end of file From 070e85a8b524777a78525a1cce713ba9a5d1ad10 Mon Sep 17 00:00:00 2001 From: Marcelo R Costa Date: Thu, 2 Jul 2020 12:12:57 -0500 Subject: [PATCH 2/4] apply version 2020.07 to preprod.gen3.biodatacatalyst.nhlbi.nih.gov From 689d69a94c78d2c5d862e7005213dab81c8cef28 Mon Sep 17 00:00:00 2001 From: Marcelo Costa Date: Thu, 2 Jul 2020 12:14:23 -0500 Subject: [PATCH 3/4] upgrading hatchery --- .../manifests/hatchery/hatchery.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json index 38dc799a4d..60744cace8 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/gen3fuse-sidecar:0.1.5", + "image": "quay.io/cdis/gen3fuse-sidecar:2020.07", "env": { "NAMESPACE": "internalstaging", "HOSTNAME": "internalstaging.datastage.io" @@ -172,4 +172,4 @@ "fs-gid": 100 } ] -} \ No newline at end of file +} From 69ca57302150c8c6500fd0be1fee6a47f4cd733c Mon Sep 17 00:00:00 2001 From: Marcelo Costa Date: Thu, 2 Jul 2020 13:55:04 -0500 Subject: [PATCH 4/4] fix data-ingestion-pipeline version --- preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index 451f5b634f..be04c42151 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -26,7 +26,7 @@ "ambassador": "quay.io/datawire/ambassador:1.4.2", "wts": "quay.io/cdis/workspace-token-service:2020.07", "manifestservice": "quay.io/cdis/manifestservice:2020.07", - "data-ingestion-pipeline": "quay.io/cdis/bdcat-data-ingestion:2020.07", + "data-ingestion-pipeline": "quay.io/cdis/bdcat-data-ingestion:1.1", "ssjdispatcher": "quay.io/cdis/ssjdispatcher:2020.07", "dashboard": "quay.io/cdis/gen3-statics:2020.07" }, @@ -378,4 +378,4 @@ "targetCpu": 40 } } -} \ No newline at end of file +}