From 382a08928db5baedcdfa342d8e889d27c5d35e6a Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Tue, 2 Apr 2024 20:16:57 +0200 Subject: [PATCH 1/9] fix: fixes a regex problem on groundswell manifest Lift and shift for https://github.com/seqeralabs/docs_old/pull/115/ Signed-off-by: Justine Geffen --- .../version-23.3.0/enterprise/_templates/k8s/groundswell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml index eb5f422c6..aa44276ee 100644 --- a/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml @@ -68,7 +68,7 @@ spec: - | echo "$(date): starting check for db $TOWER_DB_URL" # Strip initial Java connection string and options after '?' from URI - until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)?.*@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do + until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do echo "$(date): see you in $SLEEP_PERIOD_SECONDS seconds" sleep $SLEEP_PERIOD_SECONDS done From 220dc00096817fc973571df22d2cc46aa31b9978 Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Tue, 2 Apr 2024 20:17:27 +0200 Subject: [PATCH 2/9] Update groundswell.yml Signed-off-by: Justine Geffen --- .../version-23.4.0/enterprise/_templates/k8s/groundswell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml index d5316cb66..20748589c 100644 --- a/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml @@ -68,7 +68,7 @@ spec: - | echo "$(date): starting check for db $TOWER_DB_URL" # Strip initial Java connection string and options after '?' from URI - until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)?.*@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do + until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do echo "$(date): see you in $SLEEP_PERIOD_SECONDS seconds" sleep $SLEEP_PERIOD_SECONDS done From bc4e43669ac2540c59813e1510dcf6ea07c16830 Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Mon, 5 Aug 2024 23:07:56 +0200 Subject: [PATCH 3/9] Update platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml Co-authored-by: Alberto Chiusole <1922124+bebosudo@users.noreply.github.com> Signed-off-by: Justine Geffen --- .../version-23.4.0/enterprise/_templates/k8s/groundswell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml index 20748589c..d33d1a934 100644 --- a/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml @@ -68,7 +68,7 @@ spec: - | echo "$(date): starting check for db $TOWER_DB_URL" # Strip initial Java connection string and options after '?' from URI - until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do + until mysqlsh --uri "$(echo $TOWER_DB_URL |cut -d'?' -f1 |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do echo "$(date): see you in $SLEEP_PERIOD_SECONDS seconds" sleep $SLEEP_PERIOD_SECONDS done From 44325d01ff4b133d1a2d3c1dff275424c5333ec5 Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Mon, 5 Aug 2024 23:08:03 +0200 Subject: [PATCH 4/9] Update platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml Co-authored-by: Alberto Chiusole <1922124+bebosudo@users.noreply.github.com> Signed-off-by: Justine Geffen --- .../version-23.3.0/enterprise/_templates/k8s/groundswell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml index aa44276ee..1582b62ad 100644 --- a/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml @@ -68,7 +68,7 @@ spec: - | echo "$(date): starting check for db $TOWER_DB_URL" # Strip initial Java connection string and options after '?' from URI - until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do + until mysqlsh --uri "$(echo $TOWER_DB_URL |cut -d'?' -f1 |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do echo "$(date): see you in $SLEEP_PERIOD_SECONDS seconds" sleep $SLEEP_PERIOD_SECONDS done From 2c7856739fb2c1c32a47d24c0719fa4e8b6e4d3d Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Wed, 7 Aug 2024 19:21:36 +0200 Subject: [PATCH 5/9] Rename platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml to platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml Signed-off-by: Justine Geffen --- .../enterprise_templates}/k8s/groundswell.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename platform_versioned_docs/{version-23.3.0/enterprise/_templates => version-23.3/enterprise_templates}/k8s/groundswell.yml (100%) diff --git a/platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml similarity index 100% rename from platform_versioned_docs/version-23.3.0/enterprise/_templates/k8s/groundswell.yml rename to platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml From ae9781e02daeac16f7581dfd404beb945bd7cedc Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Wed, 7 Aug 2024 19:22:21 +0200 Subject: [PATCH 6/9] Rename platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml to platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml Signed-off-by: Justine Geffen --- .../enterprise_templates}/k8s/groundswell.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename platform_versioned_docs/{version-23.4.0/enterprise/_templates => version-23.4/enterprise_templates}/k8s/groundswell.yml (100%) diff --git a/platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml similarity index 100% rename from platform_versioned_docs/version-23.4.0/enterprise/_templates/k8s/groundswell.yml rename to platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml From f609838432a90312c8038b71ede9b035381bf609 Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Thu, 10 Oct 2024 11:11:47 +0200 Subject: [PATCH 7/9] Apply suggestions from code review Co-authored-by: Alberto Chiusole <1922124+bebosudo@users.noreply.github.com> Signed-off-by: Justine Geffen --- .../version-23.3/enterprise_templates/k8s/groundswell.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml index 1582b62ad..f78f78096 100644 --- a/platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.3/enterprise_templates/k8s/groundswell.yml @@ -61,7 +61,7 @@ spec: initContainers: - name: wait-for-tower-db - image: "mysql:5.7" + image: "mysql:8.0" command: - 'bash' - '-c' @@ -81,7 +81,7 @@ spec: name: tower-backend-cfg - name: wait-for-swell-db - image: "mysql:5.7" + image: "mysql:8.0" command: - 'bash' - '-c' @@ -101,7 +101,7 @@ spec: name: tower-groundswell-cfg - name: migrate-db - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" command: ['/opt/groundswell/bin/migrate-db.sh'] envFrom: - configMapRef: @@ -111,7 +111,7 @@ spec: containers: - name: groundswell - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" env: - name: MPLCONFIGDIR value: "/tmp" From 2efb01d98d47fd6af636fbab35fb2ec935d3f93b Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Thu, 10 Oct 2024 13:32:45 +0200 Subject: [PATCH 8/9] Update groundswell.yml Signed-off-by: Justine Geffen --- .../version-23.4/enterprise_templates/k8s/groundswell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml b/platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml index d33d1a934..866ae52dd 100644 --- a/platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-23.4/enterprise_templates/k8s/groundswell.yml @@ -101,7 +101,7 @@ spec: name: tower-groundswell-cfg - name: migrate-db - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" command: ['/opt/groundswell/bin/migrate-db.sh'] envFrom: - configMapRef: @@ -111,7 +111,7 @@ spec: containers: - name: groundswell - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" env: - name: MPLCONFIGDIR value: "/tmp" From c720fd7416fb623cc517b97db332f8422723e900 Mon Sep 17 00:00:00 2001 From: Justine Geffen Date: Thu, 10 Oct 2024 13:37:55 +0200 Subject: [PATCH 9/9] Update groundswell.yml Updated groundswell manifest 24.1 Signed-off-by: Justine Geffen --- .../version-24.1/enterprise/_templates/k8s/groundswell.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform_versioned_docs/version-24.1/enterprise/_templates/k8s/groundswell.yml b/platform_versioned_docs/version-24.1/enterprise/_templates/k8s/groundswell.yml index d5316cb66..866ae52dd 100644 --- a/platform_versioned_docs/version-24.1/enterprise/_templates/k8s/groundswell.yml +++ b/platform_versioned_docs/version-24.1/enterprise/_templates/k8s/groundswell.yml @@ -68,7 +68,7 @@ spec: - | echo "$(date): starting check for db $TOWER_DB_URL" # Strip initial Java connection string and options after '?' from URI - until mysqlsh --uri "$(echo $TOWER_DB_URL |sed -e 's@jdbc:\(.*\)?.*@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do + until mysqlsh --uri "$(echo $TOWER_DB_URL |cut -d'?' -f1 |sed -e 's@jdbc:\(.*\)@\1@')" -u"$TOWER_DB_USER" -p"$TOWER_DB_PASSWORD" --sql -e "SELECT VERSION()"; do echo "$(date): see you in $SLEEP_PERIOD_SECONDS seconds" sleep $SLEEP_PERIOD_SECONDS done @@ -101,7 +101,7 @@ spec: name: tower-groundswell-cfg - name: migrate-db - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" command: ['/opt/groundswell/bin/migrate-db.sh'] envFrom: - configMapRef: @@ -111,7 +111,7 @@ spec: containers: - name: groundswell - image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.3.3" + image: "cr.seqera.io/private/nf-tower-enterprise/groundswell:0.4.0" env: - name: MPLCONFIGDIR value: "/tmp"