From 46d7d65e1602f6e43ac2b009f2894d2229afcde5 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 14:49:51 -0400 Subject: [PATCH 1/6] Release commit for 2.10.3 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 8d8b7a59..059fae1a 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.2" + defaultVitessLiteImage = "vitess/lite:v17.0.3" 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 1eaf9028..6222ecdb 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.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 + vtctld: vitess/lite:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 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 933872d1..aee495b0 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.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 + vtctld: vitess/lite:v17.0.3-mysql57 + vtgate: vitess/lite:v17.0.3-mysql57 + vttablet: vitess/lite:v17.0.3-mysql57 + vtorc: vitess/lite:v17.0.3-mysql57 + vtbackup: vitess/lite:v17.0.3-mysql57 mysqld: - mysql56Compatible: vitess/lite:v17.0.2 + mysql56Compatible: vitess/lite:v17.0.3-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 d6ffbcc4..e1833ed6 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.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 + vtctld: vitess/lite:v17.0.3 + vtadmin: vitess/vtadmin:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 mysqld: - mysql80Compatible: vitess/lite:v17.0.2 + mysql80Compatible: vitess/lite:v17.0.3 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 0cab531e..e34c9016 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.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 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql56Compatible: vitess/lite:v17.0.2 + mysql56Compatible: vitess/lite:v17.0.3 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 76465fe1..4620cc47 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.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 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql80Compatible: vitess/lite:v17.0.2 + mysql80Compatible: vitess/lite:v17.0.3 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 5cf5c217..656b3924 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.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 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql80Compatible: vitess/lite:v17.0.2 + mysql80Compatible: vitess/lite:v17.0.3 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 068c90c0..7f622cf0 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.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 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql80Compatible: vitess/lite:v17.0.2 + mysql80Compatible: vitess/lite:v17.0.3 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 387a1e2a..2f8f66fa 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.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 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql80Compatible: vitess/lite:v17.0.2 + mysql80Compatible: vitess/lite:v17.0.3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From f4393d3333c8ca52eebf5c5319a66a2e0fe3b2ab Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 14:49:51 -0400 Subject: [PATCH 2/6] 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 f4bc609c..9d2fe2e3 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.4" ) From 3c4c55df310fb458037ff369665df7cf6d000fcd Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 14:54:32 -0400 Subject: [PATCH 3/6] Remove mysql57 image usage in backup tests And use the latest buildkite bundle Signed-off-by: Matt Lord --- .buildkite/pipeline.yml | 2 +- .../operator/101_initial_cluster_backup.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 908a14fa..ade86458 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ agents: - queue: "public-v5" + queue: "public" # 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. diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index aee495b0..e16a04c8 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.3-mysql57 - vtgate: vitess/lite:v17.0.3-mysql57 - vttablet: vitess/lite:v17.0.3-mysql57 - vtorc: vitess/lite:v17.0.3-mysql57 - vtbackup: vitess/lite:v17.0.3-mysql57 + vtctld: vitess/lite:v17.0.3 + vtgate: vitess/lite:v17.0.3 + vttablet: vitess/lite:v17.0.3 + vtorc: vitess/lite:v17.0.3 + vtbackup: vitess/lite:v17.0.3 mysqld: - mysql56Compatible: vitess/lite:v17.0.3-mysql57 + mysql56Compatible: vitess/lite:v17.0.3 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 9ddcf14fd6de403b1729a19fa481bb7af845ceff Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 14:59:43 -0400 Subject: [PATCH 4/6] Update verifyVtGateVersion Signed-off-by: Matt Lord --- 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 d6dd0adc..4b861921 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.2" +verifyVtGateVersion "17.0.3" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index a5c408a5..438bede6 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 "17.0.2" +verifyVtGateVersion "17.0.3" 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 d5d3cc99..e498262b 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.2" +verifyVtGateVersion "17.0.3" checkSemiSyncSetup # Check Vtadmin is setup From 440508d1a3f6985802511c40e3e64b8a742a963a Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 15:05:44 -0400 Subject: [PATCH 5/6] Remove usage of mysql57 in release tool Signed-off-by: Matt Lord --- tools/release/do_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release/do_release.sh b/tools/release/do_release.sh index 11603160..53d6b64b 100755 --- a/tools/release/do_release.sh +++ b/tools/release/do_release.sh @@ -32,7 +32,7 @@ function updateVitessImages() { sed -i.bak -E "s/vitess\/vtadmin:(.*)/vitess\/vtadmin:v$new_vitess_version/g" $operator_files sed -i.bak -E "s/vitess\/lite:(.*)/vitess\/lite:v$new_vitess_version\"/g" $ROOT/pkg/apis/planetscale/v2/defaults.go sed -i.bak -E "s/vitess\/lite:(.*)/vitess\/lite:v$old_vitess_version/g" $ROOT/test/endtoend/operator/101_initial_cluster.yaml - sed -i.bak -E "s/vitess\/lite:(.*)/vitess\/lite:v$new_vitess_version-mysql57/g" $ROOT/test/endtoend/operator/101_initial_cluster_backup.yaml + sed -i.bak -E "s/vitess\/lite:(.*)/vitess\/lite:v$new_vitess_version/g" $ROOT/test/endtoend/operator/101_initial_cluster_backup.yaml rm -f $(find -E $ROOT/test/endtoend/operator/ -name "*.yaml.bak") $ROOT/pkg/apis/planetscale/v2/defaults.go.bak } @@ -74,4 +74,4 @@ echo " git push origin v$NEW_OPERATOR_VERSION" echo "" echo "And push your current branch in order to open a Pull Request against the release branch." echo "" -echo "" \ No newline at end of file +echo "" From c9abff6e391cc653d4c40874ae61a95384c3af80 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 15:28:49 -0400 Subject: [PATCH 6/6] Missed a spot to update expected vtgate version Signed-off-by: Matt Lord --- 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 438bede6..23e1ff51 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -245,7 +245,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator.yaml" "101_initial_cluster.yaml" -verifyVtGateVersion "16.0.4" +verifyVtGateVersion "16.0.5" checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync"