From ea54f8f063a99fbc0811b3faaafad5cdaa25b32c Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:05:08 +0300 Subject: [PATCH 1/6] Set vitess golang dependencies to 20.0.0-rc2 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 cf13f9d2..36c5f549 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.20.0-rc1 + vitess.io/vitess v0.20.0-rc2 ) require ( diff --git a/go.sum b/go.sum index 0e8b91c5..1cff84ca 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.20.0-rc1 h1:xxe6NDjrhMb7nTW4Rafue+mUpOIdcIN1oV+tMasaMrk= -vitess.io/vitess v0.20.0-rc1/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= +vitess.io/vitess v0.20.0-rc2 h1:7E3qvPw2XjGk/K4K1b3NfKIA9IQXu4DizC5MNU/Y3sk= +vitess.io/vitess v0.20.0-rc2/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= From 196a297f8c15f650c28d0eff16182aafe36a7d6f Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:05:11 +0300 Subject: [PATCH 2/6] Update the version file to 2.13.0-rc2 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 ab4a5349..d677c28f 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" + Version = "2.13.0-rc2" ) From 6cb914a043c31dd0e7eb58dedb7ad565ad294738 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:05:16 +0300 Subject: [PATCH 3/6] 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 82fc8367..92fbe484 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:v20.0.0-rc1" + defaultVitessLiteImage = "vitess/lite:v20.0.0-rc2" 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 23fae288..10ba5dbb 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 a8b9673f..d5d8b2e9 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 69727051..03afd317 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtadmin: vitess/vtadmin:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 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 b8b8f328..89d5653c 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 88a1f171..034a295f 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 f081ee1d..7c855d67 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 6e50b017..9771d2c0 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 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 fea06bde..f5ec9c6f 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: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 + vtctld: vitess/lite:v20.0.0-rc2 + vtgate: vitess/lite:v20.0.0-rc2 + vttablet: vitess/lite:v20.0.0-rc2 + vtorc: vitess/lite:v20.0.0-rc2 + vtbackup: vitess/lite:v20.0.0-rc2 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 From b49c8273000fbdba3935547ec8a6774b2485c377 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:05:21 +0300 Subject: [PATCH 4/6] 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 d677c28f..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-rc2" + Version = "2.13.0" ) From 3554a703cdfc33c9c8ba1c8e7909e05e9850ad4e Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:22:53 +0300 Subject: [PATCH 5/6] update to rc2 Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- 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 d91a3b51..19954a80 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 "20.0.0-rc1" +verifyVtGateVersion "20.0.0-rc2" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 94f82069..967649c3 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 "20.0.0-rc1" +verifyVtGateVersion "20.0.0-rc2" 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 fe09e112..0e1a0cc7 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 "20.0.0-rc1" +verifyVtGateVersion "20.0.0-rc2" checkSemiSyncSetup # Check Vtadmin is setup From 9fd1f70b16fea64edfff3f3624e4000ee6e1bc34 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 20 Jun 2024 08:02:29 -0600 Subject: [PATCH 6/6] Expect rc-2 in the 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 a5063555..00cd8085 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 "20.0.0-rc1" +verifyVtGateVersion "20.0.0-rc2" checkSemiSyncSetup verifyListBackupsOutputWithSchedule