From 72c8e0b65ba6fb150a4accaa78458265acbcbc0f Mon Sep 17 00:00:00 2001 From: Di Wu Date: Tue, 12 May 2020 14:33:59 -0500 Subject: [PATCH 1/3] indexd migration and bump all services --- gen3qa.kidsfirstdrc.org/manifest.json | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gen3qa.kidsfirstdrc.org/manifest.json b/gen3qa.kidsfirstdrc.org/manifest.json index 033061a40c..369f5056a6 100644 --- a/gen3qa.kidsfirstdrc.org/manifest.json +++ b/gen3qa.kidsfirstdrc.org/manifest.json @@ -7,17 +7,16 @@ "autodeploy": "yes" }, "versions": { - "arborist": "quay.io/cdis/arborist:2.3.2", + "arborist": "quay.io/cdis/arborist:2020.05", "dashboard": "quay.io/cdis/gen3-statics:1.0.0", - "fence": "quay.io/cdis/fence:4.8.0", - "indexd": "quay.io/cdis/indexd:2.5.0", - "peregrine": "quay.io/cdis/peregrine:2.1.1", - "pidgin": "quay.io/cdis/pidgin:1.2.0", - "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1", - "sheepdog": "quay.io/cdis/sheepdog:2.1.2", - "portal": "quay.io/cdis/data-portal:2.22.10", + "fence": "quay.io/cdis/fence:2020.05", + "indexd": "quay.io/cdis/indexd:2020.05", + "peregrine": "quay.io/cdis/peregrine:2020.05", + "pidgin": "quay.io/cdis/pidgin:2020.05", + "revproxy": "quay.io/cdis/nginx:2020.05", + "sheepdog": "quay.io/cdis/sheepdog:2020.05", + "portal": "quay.io/cdis/data-portal:2020.05", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "jupyterhub": "quay.io/occ_data/jupyterhub:master" }, "arborist": { "deployment_version": "2" @@ -25,9 +24,6 @@ "indexd": { "arborist": "true" }, - "jupyterhub": { - "enabled": "no" - }, "global": { "environment": "kfqa2", "hostname": "gen3qa.kidsfirstdrc.org", @@ -64,9 +60,6 @@ }, "sheepdog": { "strategy": "auto" - }, - "guppy": { - "strategy": "auto" } } } From b7cdcc2fef82d46d0f017cfa99fa55e8615b032b Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre Date: Tue, 12 May 2020 14:38:27 -0500 Subject: [PATCH 2/3] Update gen3qa.kidsfirstdrc.org/manifest.json --- gen3qa.kidsfirstdrc.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen3qa.kidsfirstdrc.org/manifest.json b/gen3qa.kidsfirstdrc.org/manifest.json index 369f5056a6..ba0168a800 100644 --- a/gen3qa.kidsfirstdrc.org/manifest.json +++ b/gen3qa.kidsfirstdrc.org/manifest.json @@ -16,7 +16,7 @@ "revproxy": "quay.io/cdis/nginx:2020.05", "sheepdog": "quay.io/cdis/sheepdog:2020.05", "portal": "quay.io/cdis/data-portal:2020.05", - "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", + "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch" }, "arborist": { "deployment_version": "2" From b02478cafb73129639341bd82419c9e3d83f7698 Mon Sep 17 00:00:00 2001 From: Di Wu Date: Tue, 12 May 2020 14:39:07 -0500 Subject: [PATCH 3/3] remove , --- gen3qa.kidsfirstdrc.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen3qa.kidsfirstdrc.org/manifest.json b/gen3qa.kidsfirstdrc.org/manifest.json index 369f5056a6..ba0168a800 100644 --- a/gen3qa.kidsfirstdrc.org/manifest.json +++ b/gen3qa.kidsfirstdrc.org/manifest.json @@ -16,7 +16,7 @@ "revproxy": "quay.io/cdis/nginx:2020.05", "sheepdog": "quay.io/cdis/sheepdog:2020.05", "portal": "quay.io/cdis/data-portal:2020.05", - "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", + "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch" }, "arborist": { "deployment_version": "2"