From cbb002d1035b0ee3fdc93ddea79814c466c37d6c Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Wed, 23 Oct 2024 07:34:48 +0200 Subject: [PATCH] Update for v21 rc2 Signed-off-by: Rohit Nayak --- go.mod | 2 +- pkg/apis/planetscale/v2/defaults.go | 2 +- .../operator/101_initial_cluster_backup.yaml | 10 +++++----- .../101_initial_cluster_backup_schedule.yaml | 10 +++++----- .../101_initial_cluster_unmanaged_tablet.yaml | 12 ++++++------ .../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 +++++----- tools/get-e2e-test-deps.sh | 4 ++-- 12 files changed, 51 insertions(+), 51 deletions(-) diff --git a/go.mod b/go.mod index 5bfb7f04..049ecd17 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( sigs.k8s.io/controller-runtime v0.19.0 sigs.k8s.io/controller-tools v0.16.1 sigs.k8s.io/kustomize v2.0.3+incompatible - vitess.io/vitess v0.21.0-rc1 + vitess.io/vitess v0.21.0-rc2 ) require ( diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 9d2bd261..8dc3f342 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:v21.0.0-rc1" + defaultVitessLiteImage = "vitess/lite:v21.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 8de19682..f8af293c 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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 34353e9c..047e2ea8 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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_unmanaged_tablet.yaml b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml index 3b100224..d92d1bca 100644 --- a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml +++ b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml @@ -8,12 +8,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v21.0.0-rc1 - vtadmin: vitess/vtadmin:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtadmin: vitess/vtadmin:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.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 317d7a3a..95b587ec 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:v21.0.0-rc1 - vtadmin: vitess/vtadmin:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtadmin: vitess/vtadmin:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.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 58a80d53..33e0b9a6 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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 92a06b1f..dd24fb32 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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 691c034c..9b478b33 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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 f68e8610..d2396829 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.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 315797b7..78cc83f0 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:v21.0.0-rc1 - vtgate: vitess/lite:v21.0.0-rc1 - vttablet: vitess/lite:v21.0.0-rc1 - vtorc: vitess/lite:v21.0.0-rc1 - vtbackup: vitess/lite:v21.0.0-rc1 + vtctld: vitess/lite:v21.0.0-rc2 + vtgate: vitess/lite:v21.0.0-rc2 + vttablet: vitess/lite:v21.0.0-rc2 + vtorc: vitess/lite:v21.0.0-rc2 + vtbackup: vitess/lite:v21.0.0-rc2 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/tools/get-e2e-test-deps.sh b/tools/get-e2e-test-deps.sh index c74d2ba6..77aef7c2 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=20.0.2 - file=vitess-${version}-2592c59.tar.gz + version=21.0.0-rc2 + file=vitess-${version}-5f957b2.tar.gz wget https://github.com/vitessio/vitess/releases/download/v${version}/${file} tar -xzf ${file} cd ${file/.tar.gz/}