From 9f6c44b1a7a5209e1f1908acab2ae907ea18e1c1 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:38:34 +0300 Subject: [PATCH 1/8] Set vitess golang dependencies to 20.0.0-rc1 Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ae414c71..cf13f9d2 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/controller-tools v0.11.3 sigs.k8s.io/kustomize v2.0.3+incompatible - vitess.io/vitess v0.10.3-0.20240606141140-87ecae7de905 + vitess.io/vitess v0.20.0-rc1 ) require ( diff --git a/go.sum b/go.sum index 4b972226..0e8b91c5 100644 --- a/go.sum +++ b/go.sum @@ -784,5 +784,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77Vzej sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= -vitess.io/vitess v0.10.3-0.20240606141140-87ecae7de905 h1:sSrT/sVNB79f2ZpNtOeYtpd4g7fsGgDeLw4hYA//4Mo= -vitess.io/vitess v0.10.3-0.20240606141140-87ecae7de905/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= +vitess.io/vitess v0.20.0-rc1 h1:xxe6NDjrhMb7nTW4Rafue+mUpOIdcIN1oV+tMasaMrk= +vitess.io/vitess v0.20.0-rc1/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= From 1b4fc2c9a22f696d7cab2d3daed7c846e171c131 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:38:36 +0300 Subject: [PATCH 2/8] Update the version file to 2.13.0-rc1 Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index d52979b0..d277948f 100644 --- a/version/version.go +++ b/version/version.go @@ -20,5 +20,5 @@ package version // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER var ( - Version = "2.12.0" + Version = "2.13.0-rc1" ) From fdd8b34837a9d36b4cb558f88bb6caf4821a2778 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:38:42 +0300 Subject: [PATCH 3/8] Update test code to use proper image Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- pkg/apis/planetscale/v2/defaults.go | 2 +- .../operator/101_initial_cluster_backup.yaml | 10 +++++----- .../101_initial_cluster_backup_schedule.yaml | 10 +++++----- .../operator/101_initial_cluster_vtorc_vtadmin.yaml | 12 ++++++------ test/endtoend/operator/102_keyspace_teardown.yaml | 10 +++++----- test/endtoend/operator/201_customer_tablets.yaml | 10 +++++----- test/endtoend/operator/302_new_shards.yaml | 10 +++++----- test/endtoend/operator/306_down_shard_0.yaml | 10 +++++----- test/endtoend/operator/cluster_upgrade.yaml | 10 +++++----- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 85b911ab..82fc8367 100644 --- a/pkg/apis/planetscale/v2/defaults.go +++ b/pkg/apis/planetscale/v2/defaults.go @@ -102,7 +102,7 @@ const ( // DefaultMysqlPortName is the name for the MySQL port. DefaultMysqlPortName = "mysql" - defaultVitessLiteImage = "vitess/lite:latest" + defaultVitessLiteImage = "vitess/lite:v20.0.0-rc1" defaultMySQLImage = "mysql:8.0.30" DefaultInitCPURequestMillis = 100 diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index 63fadac2..23fae288 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -15,11 +15,11 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml index c1cf7737..a8b9673f 100644 --- a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml @@ -46,11 +46,11 @@ spec: keyspace: "commerce" shard: "-" images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml index e6ba0c5c..69727051 100644 --- a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml +++ b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml @@ -8,12 +8,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtadmin: vitess/vtadmin:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml index 013a5bc2..b8b8f328 100644 --- a/test/endtoend/operator/102_keyspace_teardown.yaml +++ b/test/endtoend/operator/102_keyspace_teardown.yaml @@ -15,11 +15,11 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml index bd9145f4..88a1f171 100644 --- a/test/endtoend/operator/201_customer_tablets.yaml +++ b/test/endtoend/operator/201_customer_tablets.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml index f6f62788..f081ee1d 100644 --- a/test/endtoend/operator/302_new_shards.yaml +++ b/test/endtoend/operator/302_new_shards.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml index ca620841..6e50b017 100644 --- a/test/endtoend/operator/306_down_shard_0.yaml +++ b/test/endtoend/operator/306_down_shard_0.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml index 2aa0e229..fea06bde 100644 --- a/test/endtoend/operator/cluster_upgrade.yaml +++ b/test/endtoend/operator/cluster_upgrade.yaml @@ -8,11 +8,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtorc: vitess/lite:latest - vtbackup: vitess/lite:latest + vtctld: vitess/lite:v20.0.0-rc1 + vtgate: vitess/lite:v20.0.0-rc1 + vttablet: vitess/lite:v20.0.0-rc1 + vtorc: vitess/lite:v20.0.0-rc1 + vtbackup: vitess/lite:v20.0.0-rc1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 From fbd5cbad3ce46d69cc85676ebc2116a3742214f1 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:38:47 +0300 Subject: [PATCH 4/8] Go back to dev mode Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index d277948f..ab4a5349 100644 --- a/version/version.go +++ b/version/version.go @@ -20,5 +20,5 @@ package version // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER var ( - Version = "2.13.0-rc1" + Version = "2.13.0" ) From af93011a1c4c4bd72320f510e03ab96db50df163 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:04:06 +0300 Subject: [PATCH 5/8] empty commit to kick CI Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> From ffc1011882f16f2867d742dcb8d9e33831b3cfa5 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 13 Jun 2024 12:11:17 -0600 Subject: [PATCH 6/8] Update with proper vtgate version Signed-off-by: Florent Poinsard --- test/endtoend/backup_restore_test.sh | 2 +- test/endtoend/upgrade_test.sh | 2 +- test/endtoend/vtorc_vtadmin_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh index a9c48b9f..d91a3b51 100755 --- a/test/endtoend/backup_restore_test.sh +++ b/test/endtoend/backup_restore_test.sh @@ -108,7 +108,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml" -verifyVtGateVersion "21.0.0" +verifyVtGateVersion "20.0.0-rc1" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 90101d92..94f82069 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -250,7 +250,7 @@ checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" upgradeToLatest -verifyVtGateVersion "21.0.0" +verifyVtGateVersion "20.0.0-rc1" checkSemiSyncSetup # After upgrading, we verify that the durability policy is still semi_sync verifyDurabilityPolicy "commerce" "semi_sync" diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh index c5487bbc..fe09e112 100755 --- a/test/endtoend/vtorc_vtadmin_test.sh +++ b/test/endtoend/vtorc_vtadmin_test.sh @@ -242,7 +242,7 @@ killall kubectl setupKubectlAccessForCI get_started_vtorc_vtadmin -verifyVtGateVersion "21.0.0" +verifyVtGateVersion "20.0.0-rc1" checkSemiSyncSetup # Check Vtadmin is setup From c4b900049af6528a4adcbab50037c349d82fdc59 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 13 Jun 2024 12:11:56 -0600 Subject: [PATCH 7/8] Update with proper vtgate version in schedule test Signed-off-by: Florent Poinsard --- test/endtoend/backup_schedule_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/endtoend/backup_schedule_test.sh b/test/endtoend/backup_schedule_test.sh index ef2c45f3..a5063555 100755 --- a/test/endtoend/backup_schedule_test.sh +++ b/test/endtoend/backup_schedule_test.sh @@ -79,7 +79,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup_schedule.yaml" -verifyVtGateVersion "21.0.0" +verifyVtGateVersion "20.0.0-rc1" checkSemiSyncSetup verifyListBackupsOutputWithSchedule From 1e4b1691b8b74a6463be0f815e524478781de6c4 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 13 Jun 2024 12:26:37 -0600 Subject: [PATCH 8/8] Use latest version of vtctldclient Signed-off-by: Florent Poinsard --- tools/get-e2e-test-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/get-e2e-test-deps.sh b/tools/get-e2e-test-deps.sh index 330849bd..0d034f9f 100755 --- a/tools/get-e2e-test-deps.sh +++ b/tools/get-e2e-test-deps.sh @@ -40,8 +40,8 @@ fi if ! command -v vtctldclient &> /dev/null then echo "Downloading vtctldclient..." - version=19.0.3 - file=vitess-${version}-cb5464e.tar.gz + version=20.0.0-rc1 + file=vitess-${version}-7e8c974.tar.gz wget https://github.com/vitessio/vitess/releases/download/v${version}/${file} tar -xzf ${file} cd ${file/.tar.gz/}