From 9cb09ff5a5f1362c9552f6d30c860b365277ea3d Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:15:56 +0300 Subject: [PATCH 1/5] Set vitess golang dependencies to 20.0.0 This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser 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 36c5f549..2231128f 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-rc2 + vitess.io/vitess v0.20.0 ) require ( diff --git a/go.sum b/go.sum index 1cff84ca..4c4f6899 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-rc2 h1:7E3qvPw2XjGk/K4K1b3NfKIA9IQXu4DizC5MNU/Y3sk= -vitess.io/vitess v0.20.0-rc2/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= +vitess.io/vitess v0.20.0 h1:EIEq9r0SJCgsFl1NXRAoFIrY0GxwvzaVDy1G25pdMwo= +vitess.io/vitess v0.20.0/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= From d398fb341ce8a7ded7963d751ddc57db878501b0 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:16:02 +0300 Subject: [PATCH 2/5] Update test code to use proper image This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser 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 92fbe484..e5067b0f 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-rc2" + defaultVitessLiteImage = "vitess/lite:v20.0.0" 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 10ba5dbb..56d885b3 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 d5d8b2e9..94898da7 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 03afd317..aa613cbe 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-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 + vtctld: vitess/lite:v20.0.0 + vtadmin: vitess/vtadmin:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 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 89d5653c..ff8ebde6 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 034a295f..186d7441 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 7c855d67..81ce5b2f 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 9771d2c0..c842d550 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 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 f5ec9c6f..aceb1f4f 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-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 + vtctld: vitess/lite:v20.0.0 + vtgate: vitess/lite:v20.0.0 + vttablet: vitess/lite:v20.0.0 + vtorc: vitess/lite:v20.0.0 + vtbackup: vitess/lite:v20.0.0 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 From da83a4188c12315e19f9dceee4d42ff45c517eef Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:16:07 +0300 Subject: [PATCH 3/5] Go back to dev mode This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser 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..dd1f5457 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.1" ) From f7e94cec798cfe180d9cd443190e743543fa5229 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:21:09 +0300 Subject: [PATCH 4/5] update to 20.0.0 Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- test/endtoend/backup_restore_test.sh | 2 +- test/endtoend/backup_schedule_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 19954a80..e0f3bcad 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-rc2" +verifyVtGateVersion "20.0.0" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/backup_schedule_test.sh b/test/endtoend/backup_schedule_test.sh index 00cd8085..2a65dc7c 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-rc2" +verifyVtGateVersion "20.0.0" checkSemiSyncSetup verifyListBackupsOutputWithSchedule diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh index 0e1a0cc7..91767fb5 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-rc2" +verifyVtGateVersion "20.0.0" checkSemiSyncSetup # Check Vtadmin is setup From e8e6bc02cbc2e2c22f2076328e8429c7614cef76 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:27:03 +0300 Subject: [PATCH 5/5] update to 20.0.0 Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- test/endtoend/upgrade_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 967649c3..b1126d54 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-rc2" +verifyVtGateVersion "20.0.0" checkSemiSyncSetup # After upgrading, we verify that the durability policy is still semi_sync verifyDurabilityPolicy "commerce" "semi_sync"