Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
sigs.k8s.io/controller-runtime v0.20.2
sigs.k8s.io/controller-tools v0.17.2
sigs.k8s.io/kustomize v2.0.3+incompatible
vitess.io/vitess v0.23.0-rc1
vitess.io/vitess v0.23.0-rc2
)

require (
Expand Down Expand Up @@ -160,7 +160,6 @@ require (
github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,6 @@ github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 h1:jw16EimP5oAEM/2w
github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1/go.mod h1:vuvdOZLJuf5HmJAJrKV64MmozrSsk+or0PB5dzdfspg=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down Expand Up @@ -960,5 +958,5 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
vitess.io/vitess v0.23.0-rc1 h1:a5a8gVww7rZw6AFGyp4mBnrUK/YiP9v1nWyNDBfB0yE=
vitess.io/vitess v0.23.0-rc1/go.mod h1:YQovcZn1QzwQL5VcUGe9e+go+nAGIH6gWF1ZQeIo328=
vitess.io/vitess v0.23.0-rc2 h1:bHCFpETNKYBzIhNUPU/m7swxHbUiOEUERE0I1uwZZhA=
vitess.io/vitess v0.23.0-rc2/go.mod h1:79F6ICWYB/ma+BSMMHO7CcE4ByqbgPYyFmZC8i01NmI=
2 changes: 1 addition & 1 deletion pkg/apis/planetscale/v2/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const (
// DefaultMysqlPortName is the name for the MySQL port.
DefaultMysqlPortName = "mysql"

defaultVitessLiteImage = "vitess/lite:v23.0.0-rc1"
defaultVitessLiteImage = "vitess/lite:v23.0.0-rc2"
defaultMySQLImage = "mysql:8.0.40"

DefaultInitCPURequestMillis = 100
Expand Down
2 changes: 1 addition & 1 deletion test/endtoend/backup_restore_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ setupKindCluster
cd test/endtoend/operator || exit 1

get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml"
verifyVtGateVersion "23.0.0-rc1"
verifyVtGateVersion "23.0.0-rc2"
checkSemiSyncSetup
takeBackup "commerce/-"
verifyListBackupsOutput
Expand Down
2 changes: 1 addition & 1 deletion test/endtoend/backup_schedule_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ setupKindCluster
cd test/endtoend/operator || exit 1

get_started "operator-latest.yaml" "101_initial_cluster_backup_schedule.yaml"
verifyVtGateVersion "23.0.0-rc1"
verifyVtGateVersion "23.0.0-rc2"
checkSemiSyncSetup
verifyListBackupsOutputWithSchedule

Expand Down
2 changes: 1 addition & 1 deletion test/endtoend/hpa_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ setupKindCluster
cd test/endtoend/operator || exit 1

get_started "operator-latest.yaml" "101_initial_cluster_autoscale.yaml"
verifyVtGateVersion "23.0.0-rc1"
verifyVtGateVersion "23.0.0-rc2"
checkSemiSyncSetup

verifyHpaCount 0
Expand Down
10 changes: 5 additions & 5 deletions test/endtoend/operator/101_initial_cluster_autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ metadata:
namespace: example
spec:
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: mysql:8.0.40
mysqldExporter: prom/mysqld-exporter:v0.14.0
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/101_initial_cluster_backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ spec:
keyspace: "commerce"
shard: "-"
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ metadata:
namespace: example
spec:
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtadmin: vitess/vtadmin:v23.0.0-rc1
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtadmin: vitess/vtadmin:v23.0.0-rc2
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: mysql:8.0.40
mysqldExporter: prom/mysqld-exporter:v0.14.0
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ metadata:
namespace: example
spec:
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtadmin: vitess/vtadmin:v23.0.0-rc1
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtadmin: vitess/vtadmin:v23.0.0-rc2
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: mysql:8.0.40
mysqldExporter: prom/mysqld-exporter:v0.14.0
Expand Down
10 changes: 5 additions & 5 deletions test/endtoend/operator/102_keyspace_teardown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: mysql:8.0.40
mysqldExporter: prom/mysqld-exporter:v0.14.0
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/201_customer_tablets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/302_new_shards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/306_down_shard_0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/401_scheduled_backups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ spec:
keyspace: "customer"
shard: "-8000"
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
10 changes: 5 additions & 5 deletions test/endtoend/operator/cluster_autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ metadata:
namespace: example
spec:
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: mysql:8.0.40
mysqldExporter: prom/mysqld-exporter:v0.14.0
Expand Down
12 changes: 6 additions & 6 deletions test/endtoend/operator/cluster_upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ spec:
persistentVolumeClaim:
claimName: vitess-backups
images:
vtctld: vitess/lite:v23.0.0-rc1-mysql80
vtgate: vitess/lite:v23.0.0-rc1-mysql80
vttablet: vitess/lite:v23.0.0-rc1-mysql80
vtorc: vitess/lite:v23.0.0-rc1-mysql80
vtbackup: vitess/lite:v23.0.0-rc1-mysql80
vtctld: vitess/lite:v23.0.0-rc2-mysql80
vtgate: vitess/lite:v23.0.0-rc2-mysql80
vttablet: vitess/lite:v23.0.0-rc2-mysql80
vtorc: vitess/lite:v23.0.0-rc2-mysql80
vtbackup: vitess/lite:v23.0.0-rc2-mysql80
mysqld:
mysql80Compatible: vitess/lite:v23.0.0-rc1-mysql80
mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80
mysqldExporter: prom/mysqld-exporter:v0.14.0
cells:
- name: zone1
Expand Down
10 changes: 5 additions & 5 deletions test/endtoend/upgrade_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ function upgradeToLatest() {
checkPodStatusWithTimeout "example-vttablet-zone1(.*)3/3(.*)Running(.*)" 3

# Wait for the cluster spec changes to take effect
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtctld" 1 "image: vitess/lite:v23.0.0-rc1"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtgate" 1 "image: vitess/lite:v23.0.0-rc1"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtorc" 1 "image: vitess/lite:v23.0.0-rc1"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vttablet" 12 "image: vitess/lite:v23.0.0-rc1"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtctld" 1 "image: vitess/lite:v23.0.0-rc2"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtgate" 1 "image: vitess/lite:v23.0.0-rc2"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vtorc" 1 "image: vitess/lite:v23.0.0-rc2"
checkPodSpecBySelectorWithTimeout example "planetscale.com/component=vttablet" 12 "image: vitess/lite:v23.0.0-rc2"

verifyVtgateDeploymentStrategy

Expand Down Expand Up @@ -271,7 +271,7 @@ checkSemiSyncSetup
# Initially too durability policy should be specified
verifyDurabilityPolicy "commerce" "semi_sync"
upgradeToLatest
verifyVtGateVersion "23.0.0-rc1"
verifyVtGateVersion "23.0.0-rc2"
verifyResourceSpec
checkSemiSyncSetup
# After upgrading, we verify that the durability policy is still semi_sync
Expand Down
2 changes: 1 addition & 1 deletion test/endtoend/vtorc_vtadmin_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ setupKindCluster
cd test/endtoend/operator || exit 1

get_started_vtorc_vtadmin
verifyVtGateVersion "23.0.0-rc1"
verifyVtGateVersion "23.0.0-rc2"
checkSemiSyncSetup

# Check Vtadmin is setup
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package version
// THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER

var (
Version = "2.16.0"
Version = "2.16.0-rc2"
)