diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 85b911aba..85fe96946 100644 --- a/pkg/apis/planetscale/v2/defaults.go +++ b/pkg/apis/planetscale/v2/defaults.go @@ -103,7 +103,7 @@ const ( DefaultMysqlPortName = "mysql" defaultVitessLiteImage = "vitess/lite:latest" - defaultMySQLImage = "mysql:8.0.30" + defaultMySQLImage = "mysql:8.0.40" DefaultInitCPURequestMillis = 100 DefaultInitMemoryRequestBytes = 32 * (1 << 20) // 32 MiB @@ -136,7 +136,7 @@ var DefaultImages = &VitessImages{ Mysql80Compatible: defaultMySQLImage, }, - MysqldExporter: "prom/mysqld-exporter:v0.11.0", + MysqldExporter: "prom/mysqld-exporter:v0.14.0", } var ( diff --git a/pkg/operator/environment/environment.go b/pkg/operator/environment/environment.go index 6d48725da..94ccdcbc6 100644 --- a/pkg/operator/environment/environment.go +++ b/pkg/operator/environment/environment.go @@ -32,7 +32,7 @@ import ( var ( reconcileTimeout time.Duration - MySQLServerVersion = "8.0.30-Vitess" + MySQLServerVersion = "8.0.40-Vitess" // truncateUILen truncate queries in debug UIs to the given length. 0 means unlimited. truncateUILen = 512 // truncateErrLen truncate queries in error logs to the given length. 0 means unlimited. diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 681d541d9..76ef570a6 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.yaml @@ -14,8 +14,8 @@ spec: vtorc: vitess/lite:v21.0.0 vtbackup: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/101_initial_cluster_autoscale.yaml b/test/endtoend/operator/101_initial_cluster_autoscale.yaml index 4ec46e533..08e19c2db 100644 --- a/test/endtoend/operator/101_initial_cluster_autoscale.yaml +++ b/test/endtoend/operator/101_initial_cluster_autoscale.yaml @@ -14,8 +14,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index b9f5bc5be..9c673128a 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -21,8 +21,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml index a75f6f093..b31c3032b 100644 --- a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml @@ -52,8 +52,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml index 241e28f68..1e02af126 100644 --- a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml +++ b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml @@ -15,8 +15,8 @@ spec: vtbackup: vitess/lite:latest vtorc: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml index c3ef381b1..8c803f007 100644 --- a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml +++ b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml @@ -15,8 +15,8 @@ spec: vtbackup: vitess/lite:latest vtorc: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml index 013a5bc2c..e9dbcab76 100644 --- a/test/endtoend/operator/102_keyspace_teardown.yaml +++ b/test/endtoend/operator/102_keyspace_teardown.yaml @@ -21,8 +21,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml index c012a9117..ef1f3546f 100644 --- a/test/endtoend/operator/201_customer_tablets.yaml +++ b/test/endtoend/operator/201_customer_tablets.yaml @@ -10,8 +10,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml index 0c6e6b416..8731afea7 100644 --- a/test/endtoend/operator/302_new_shards.yaml +++ b/test/endtoend/operator/302_new_shards.yaml @@ -10,8 +10,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml index 1da56e1a4..9684f5f28 100644 --- a/test/endtoend/operator/306_down_shard_0.yaml +++ b/test/endtoend/operator/306_down_shard_0.yaml @@ -10,8 +10,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/cluster_autoscale.yaml b/test/endtoend/operator/cluster_autoscale.yaml index 9afb6f74b..e36618964 100644 --- a/test/endtoend/operator/cluster_autoscale.yaml +++ b/test/endtoend/operator/cluster_autoscale.yaml @@ -14,8 +14,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml index 27d5c872e..18cd5484d 100644 --- a/test/endtoend/operator/cluster_upgrade.yaml +++ b/test/endtoend/operator/cluster_upgrade.yaml @@ -14,8 +14,8 @@ spec: vtorc: vitess/lite:latest vtbackup: vitess/lite:latest mysqld: - mysql80Compatible: mysql:8.0.30 - mysqldExporter: prom/mysqld-exporter:v0.11.0 + mysql80Compatible: mysql:8.0.40 + mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 gateway: