From a08b13bdfd130899a7920513509c81ce5e6e5b52 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 18 Aug 2023 09:03:03 -0400 Subject: [PATCH 1/8] Update vitess dependency to 17.0.2 Signed-off-by: Matt Lord --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 959809ec..de3c3ce5 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( sigs.k8s.io/controller-runtime v0.14.3 sigs.k8s.io/controller-tools v0.11.3 sigs.k8s.io/kustomize v2.0.3+incompatible - vitess.io/vitess v0.17.1 + vitess.io/vitess v0.17.2 ) require ( diff --git a/go.sum b/go.sum index 62719db7..a61c91a1 100644 --- a/go.sum +++ b/go.sum @@ -1143,5 +1143,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -vitess.io/vitess v0.17.1 h1:f7T2wBh4eJizvuTtMbRgveDr1wHOrHVzRx82iA9CrIc= -vitess.io/vitess v0.17.1/go.mod h1:/QmiqbpoP/cAYOg6csIJVyUrJcdhzrsIRqC+j6GKNno= +vitess.io/vitess v0.17.2 h1:xGVl0jCdP45EnTdmii1THlprJqPVr0GgBjVG9XP7YAw= +vitess.io/vitess v0.17.2/go.mod h1:/QmiqbpoP/cAYOg6csIJVyUrJcdhzrsIRqC+j6GKNno= From 329ffad3fc874366cfd82b733481317a5a7a55b1 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 18 Aug 2023 09:03:23 -0400 Subject: [PATCH 2/8] Release commit for 2.10.2 Signed-off-by: Matt Lord --- pkg/apis/planetscale/v2/defaults.go | 2 +- test/endtoend/operator/101_initial_cluster.yaml | 12 ++++++------ .../operator/101_initial_cluster_backup.yaml | 12 ++++++------ .../101_initial_cluster_vtorc_vtadmin.yaml | 14 +++++++------- test/endtoend/operator/102_keyspace_teardown.yaml | 12 ++++++------ test/endtoend/operator/201_customer_tablets.yaml | 12 ++++++------ test/endtoend/operator/302_new_shards.yaml | 12 ++++++------ test/endtoend/operator/306_down_shard_0.yaml | 12 ++++++------ test/endtoend/operator/cluster_upgrade.yaml | 12 ++++++------ 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 47d47dc0..8d8b7a59 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:v17.0.1" + defaultVitessLiteImage = "vitess/lite:v17.0.2" DefaultInitCPURequestMillis = 100 DefaultInitMemoryRequestBytes = 32 * (1 << 20) // 32 MiB diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 7529668e..34693ccf 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.yaml @@ -8,13 +8,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v16.0.3 - vtgate: vitess/lite:v16.0.3 - vttablet: vitess/lite:v16.0.3 - vtorc: vitess/lite:v16.0.3 - vtbackup: vitess/lite:v16.0.3 + vtctld: vitess/lite:v17.0.1 + vtgate: vitess/lite:v17.0.1 + vttablet: vitess/lite:v17.0.1 + vtorc: vitess/lite:v17.0.1 + vtbackup: vitess/lite:v17.0.1 mysqld: - mysql80Compatible: vitess/lite:v16.0.3 + mysql80Compatible: vitess/lite:v17.0.1 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index 97514029..dc0b52a0 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -15,13 +15,13 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v17.0.1-mysql57 - vtgate: vitess/lite:v17.0.1-mysql57 - vttablet: vitess/lite:v17.0.1-mysql57 - vtorc: vitess/lite:v17.0.1-mysql57 - vtbackup: vitess/lite:v17.0.1-mysql57 + vtctld: vitess/lite:v17.0.2-mysql57 + vtgate: vitess/lite:v17.0.2-mysql57 + vttablet: vitess/lite:v17.0.2-mysql57 + vtorc: vitess/lite:v17.0.2-mysql57 + vtbackup: vitess/lite:v17.0.2-mysql57 mysqld: - mysql56Compatible: vitess/lite:v17.0.1-mysql57 + mysql56Compatible: vitess/lite:v17.0.2-mysql57 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml index f1e02892..d6ffbcc4 100644 --- a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml +++ b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtadmin: vitess/vtadmin:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtadmin: vitess/vtadmin:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml index d53088c3..0cab531e 100644 --- a/test/endtoend/operator/102_keyspace_teardown.yaml +++ b/test/endtoend/operator/102_keyspace_teardown.yaml @@ -15,13 +15,13 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql56Compatible: vitess/lite:v17.0.1 + mysql56Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml index cb906674..76465fe1 100644 --- a/test/endtoend/operator/201_customer_tablets.yaml +++ b/test/endtoend/operator/201_customer_tablets.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml index 1469e5ce..5cf5c217 100644 --- a/test/endtoend/operator/302_new_shards.yaml +++ b/test/endtoend/operator/302_new_shards.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml index ad8f94fd..068c90c0 100644 --- a/test/endtoend/operator/306_down_shard_0.yaml +++ b/test/endtoend/operator/306_down_shard_0.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml index 877be4be..387a1e2a 100644 --- a/test/endtoend/operator/cluster_upgrade.yaml +++ b/test/endtoend/operator/cluster_upgrade.yaml @@ -8,13 +8,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 99bed936a8af2b4ddfb3d223f8c45a2c51349d66 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 18 Aug 2023 09:03:23 -0400 Subject: [PATCH 3/8] Back to dev mode Signed-off-by: Matt Lord --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c651179b..f4bc609c 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ limitations under the License. package version var ( - Version = "2.10.2" + Version = "2.10.3" ) From 64605762c6a30f7c277500d0d020a5f01383e91e Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 18 Aug 2023 09:06:33 -0400 Subject: [PATCH 4/8] Release commit for 2.10.2 Signed-off-by: Matt Lord --- test/endtoend/operator/101_initial_cluster.yaml | 12 ++++++------ version/version.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 34693ccf..1eaf9028 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.yaml @@ -8,13 +8,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v17.0.1 - vtgate: vitess/lite:v17.0.1 - vttablet: vitess/lite:v17.0.1 - vtorc: vitess/lite:v17.0.1 - vtbackup: vitess/lite:v17.0.1 + vtctld: vitess/lite:v16.0.4 + vtgate: vitess/lite:v16.0.4 + vttablet: vitess/lite:v16.0.4 + vtorc: vitess/lite:v16.0.4 + vtbackup: vitess/lite:v16.0.4 mysqld: - mysql80Compatible: vitess/lite:v17.0.1 + mysql80Compatible: vitess/lite:v16.0.4 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/version/version.go b/version/version.go index f4bc609c..c651179b 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ limitations under the License. package version var ( - Version = "2.10.3" + Version = "2.10.2" ) From a1f09738ca0abc93db05d2316e29247b3b1816fb Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 18 Aug 2023 09:06:33 -0400 Subject: [PATCH 5/8] Back to dev mode Signed-off-by: Matt Lord --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c651179b..f4bc609c 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ limitations under the License. package version var ( - Version = "2.10.2" + Version = "2.10.3" ) From d72df20bc71bce4c1289f975b01e65659838f624 Mon Sep 17 00:00:00 2001 From: Manan Gupta Date: Mon, 21 Aug 2023 13:58:14 +0530 Subject: [PATCH 6/8] test: fix test expectations Signed-off-by: Manan Gupta --- test/endtoend/backup_restore_test.sh | 2 +- test/endtoend/upgrade_test.sh | 4 ++-- test/endtoend/vtorc_vtadmin_test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh index 14b046e9..d6dd0adc 100755 --- a/test/endtoend/backup_restore_test.sh +++ b/test/endtoend/backup_restore_test.sh @@ -103,7 +103,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml" -verifyVtGateVersion "17.0.1" +verifyVtGateVersion "17.0.2" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 61deac06..a5c408a5 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -245,12 +245,12 @@ killall kubectl setupKubectlAccessForCI get_started "operator.yaml" "101_initial_cluster.yaml" -verifyVtGateVersion "16.0.3" +verifyVtGateVersion "16.0.4" checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" upgradeToLatest -verifyVtGateVersion "17.0.1" +verifyVtGateVersion "17.0.2" 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 cd10a417..d5d3cc99 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 "17.0.1" +verifyVtGateVersion "17.0.2" checkSemiSyncSetup # Check Vtadmin is setup From df9c2e414157d07a74940f09f22c8b6f57b7969b Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Wed, 23 Aug 2023 15:23:40 +0000 Subject: [PATCH 7/8] Improve test shard health check Signed-off-by: Matt Lord --- test/endtoend/utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/endtoend/utils.sh b/test/endtoend/utils.sh index 2f4d45be..259e0abd 100644 --- a/test/endtoend/utils.sh +++ b/test/endtoend/utils.sh @@ -220,8 +220,8 @@ function waitForKeyspaceToBeServing() { nb_of_replica=$3 for i in {1..600} ; do out=$(mysql --table --execute="show vitess_tablets") - echo "$out" | grep -E "$ks(.*)$shard(.*)PRIMARY(.*)SERVING|$ks(.*)$shard(.*)REPLICA(.*)SERVING" | wc -l | grep "$((nb_of_replica+1))" - if [ $? -eq 0 ]; then + numtablets=$(echo "$out" | grep -E "$ks(.*)$shard(.*)PRIMARY(.*)SERVING|$ks(.*)$shard(.*)REPLICA(.*)SERVING" | wc -l) + if [[ $numtablets -ge $((nb_of_replica+1)) ]]; then echo "Shard $ks/$shard is serving" return fi From 5738fbf3ae2f26d9f4417640e1c9276fbac70103 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Wed, 23 Aug 2023 15:29:12 +0000 Subject: [PATCH 8/8] Use older BuildKite config Signed-off-by: Matt Lord --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ade86458..908a14fa 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ agents: - queue: "public" + queue: "public-v5" # Mount the docker.sock as to the docker container, so that we are able to # run docker build command and kind is spawned as a sibling container.