From be076dca866f7ea0985db1a16c02093a56f6ac76 Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Mon, 20 Jan 2025 16:48:16 +0000
Subject: [PATCH] MySQL upgrade

Signed-off-by: Graham Campbell <hello@gjcampbell.co.uk>
---
 pkg/apis/planetscale/v2/defaults.go                           | 4 ++--
 pkg/operator/environment/environment.go                       | 2 +-
 test/endtoend/operator/101_initial_cluster.yaml               | 4 ++--
 test/endtoend/operator/101_initial_cluster_autoscale.yaml     | 4 ++--
 test/endtoend/operator/101_initial_cluster_backup.yaml        | 4 ++--
 .../operator/101_initial_cluster_backup_schedule.yaml         | 4 ++--
 .../operator/101_initial_cluster_unmanaged_tablet.yaml        | 4 ++--
 test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml | 4 ++--
 test/endtoend/operator/102_keyspace_teardown.yaml             | 4 ++--
 test/endtoend/operator/201_customer_tablets.yaml              | 4 ++--
 test/endtoend/operator/302_new_shards.yaml                    | 4 ++--
 test/endtoend/operator/306_down_shard_0.yaml                  | 4 ++--
 test/endtoend/operator/cluster_autoscale.yaml                 | 4 ++--
 test/endtoend/operator/cluster_upgrade.yaml                   | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go
index 85b911ab..85fe9694 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 6d48725d..94ccdcbc 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 681d541d..76ef570a 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 4ec46e53..08e19c2d 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 b9f5bc5b..9c673128 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 a75f6f09..b31c3032 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 241e28f6..1e02af12 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 c3ef381b..8c803f00 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 013a5bc2..e9dbcab7 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 c012a911..ef1f3546 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 0c6e6b41..8731afea 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 1da56e1a..9684f5f2 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 9afb6f74..e3661896 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 27d5c872..18cd5484 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: