Update bundled MySQL version to 8.0.40 (#17552)

Signed-off-by: Dirkjan Bussink <[email protected]> Signed-off-by: Florent Poinsard <[email protected]> Signed-off-by: Harshit Gangal <[email protected]> Co-authored-by: Florent Poinsard <[email protected]> Co-authored-by: Harshit Gangal <[email protected]>
vitessio · Jan 21, 2025 · 9b57daf · 9b57daf
1 parent 4687195
commit 9b57daf
Show file tree

Hide file tree

Showing 43 changed files with 379 additions and 1,224 deletions.
diff --git a/Makefile b/Makefile
@@ -286,7 +286,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mysql80 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=40
+BOOTSTRAP_VERSION=41
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go

diff --git a/changelog/22.0/22.0.0/summary.md b/changelog/22.0/22.0.0/summary.md
@@ -13,6 +13,8 @@
   - **[Support for LAST_INSERT_ID(x)](#last-insert-id)**
   - **[Support for Maximum Idle Connections in the Pool](#max-idle-connections)**
   - **[Stalled Disk Recovery in VTOrc](#stall-disk-recovery)**
+  - **[Update default MySQL version to 8.0.40](#mysql-8-0-40)**
+  - **[Update lite images to Debian Bookworm](#debian-bookworm)**
 - **[Minor Changes](#minor-changes)**
   - **[VTTablet Flags](#flags-vttablet)**
   - **[Topology read concurrency behaviour changes](#topo-read-concurrency-changes)**
@@ -106,6 +108,30 @@ VTOrc can now identify and recover from stalled disk errors. VTTablets test whet
 
 To opt into this feature, `--enable-primary-disk-stalled-recovery` flag has to be specified on VTOrc, and `--disk-write-dir` flag has to be specified on the vttablets. `--disk-write-interval` and `--disk-write-timeout` flags can be used to configure the polling interval and timeout respectively. 
 
+### <a id="mysql-8-0-40"/>Update default MySQL version to 8.0.40</a>
+
+The default major MySQL version used by our `vitess/lite:latest` image is going from `8.0.30` to `8.0.40`.
+This change was brought by [Pull Request #17552](https://github.com/vitessio/vitess/pull/17552).
+
+VTGate also advertises MySQL version `8.0.40` by default instead of `8.0.30` if no explicit version is set. The users can set the `mysql_server_version` flag to advertise the correct version.
+
+#### <a id="upgrading-to-this-release-with-vitess-operator"/>⚠️Upgrading to this release with vitess-operator
+
+If you are using the `vitess-operator`, considering that we are bumping the patch version of MySQL 80 from `8.0.30` to `8.0.40`, you will have to manually upgrade:
+
+1. Add `innodb_fast_shutdown=0` to your extra cnf in your YAML file.
+2. Apply this file.
+3. Wait for all the pods to be healthy.
+4. Then change your YAML file to use the new Docker Images (`vitess/lite:v22.0.0`).
+5. Remove `innodb_fast_shutdown=0` from your extra cnf in your YAML file.
+6. Apply this file.
+
+This is the last time this will be needed in the `8.0.x` series, as starting with MySQL `8.0.35` it is possible to upgrade and downgrade between `8.0.x` versions without needing to run `innodb_fast_shutdown=0`.
+
+### <a id="debian-bookworm"/>Update lite images to Debian Bookworm</a>
+
+The base system now uses Debian Bookworm instead of Debian Bullseye for the `vitess/lite` images. This change was brought by [Pull Request #17552].
+
 ## <a id="minor-changes"/>Minor Changes</a>
 
 #### <a id="flags-vttablet"/>VTTablet Flags</a>

diff --git a/docker/binaries/vtadmin/Dockerfile b/docker/binaries/vtadmin/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG VT_BASE_VER=latest
-ARG DEBIAN_VER=bullseye-slim
+ARG DEBIAN_VER=bookworm-slim
 
 FROM vitess/lite:${VT_BASE_VER} AS lite
 

diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md
@@ -157,4 +157,8 @@ List of changes between bootstrap image versions.
 
 ## [40] - 2025-01-17
 ### Changes
-- Update build to golang 1.23.5
+- Update build to golang 1.23.5
+
+## [41] - 2025-01-15
+### Changes
+- Update base image to bookworm
diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 golang:1.23.5-bullseye
+FROM --platform=linux/amd64 golang:1.23.5-bookworm
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -8,12 +8,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     chromium \
     curl \
     default-jdk \
-    etcd \
+    etcd-client \
+    etcd-server \
     g++ \
     git \
+    gnupg \
     make \
     maven \
-    software-properties-common \
     unzip \
     zip \
     xvfb \

diff --git a/docker/bootstrap/Dockerfile.mysql80 b/docker/bootstrap/Dockerfile.mysql80
@@ -8,9 +8,9 @@ USER root
 # Install MySQL 8.0
 RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 8C718D3B5072E1F5 && break; done && \
     for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com A8D3785C && break; done && \
-    add-apt-repository 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' && \
+    echo 'deb http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' > /etc/apt/sources.list.d/mysql.list && \
     for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \
-    echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \
+    echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
         echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \

diff --git a/docker/bootstrap/Dockerfile.percona80 b/docker/bootstrap/Dockerfile.percona80
@@ -7,7 +7,7 @@ USER root
 
 # Install Percona 8.0
 RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done \
-    && echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona.list && \
+    && echo 'deb http://repo.percona.com/ps-80/apt bookworm main' > /etc/apt/sources.list.d/percona.list && \
     { \
         echo debconf debconf/frontend select Noninteractive; \
         echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \
@@ -23,7 +23,7 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.c
 	rsync \
 	libev4 \
 #    && rm -f /etc/apt/sources.list.d/percona.list \
-    && echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list \
+    && echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list \
 #    { \
 #        echo debconf debconf/frontend select Noninteractive; \
 #        echo percona-server-server-8.0 percona-server-server/root_password password 'unused'; \

diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
@@ -31,7 +31,7 @@ COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
 RUN make install PREFIX=/vt/install
 
 # Start over and build the final image.
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
 # Install locale required for mysqlsh
 RUN apt-get update && apt-get install -y locales \

diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
@@ -31,7 +31,7 @@ COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
 RUN make install PREFIX=/vt/install
 
 # Start over and build the final image.
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
 # Install dependencies
 COPY docker/utils/install_dependencies.sh /vt/dist/install_dependencies.sh

diff --git a/docker/utils/install_dependencies.sh b/docker/utils/install_dependencies.sh
@@ -71,66 +71,33 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}"
 
 # Packages specific to certain flavors.
 case "${FLAVOR}" in
-mysql57)
-    if [ -z "$VERSION" ]; then
-        VERSION=5.7.31
-    fi
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${VERSION}-1debian10_amd64.deb /tmp/libmysqlclient20_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-client_${VERSION}-1debian10_amd64.deb /tmp/mysql-community-client_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_${VERSION}-1debian10_amd64.deb /tmp/mysql-client_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-server_${VERSION}-1debian10_amd64.deb /tmp/mysql-community-server_${VERSION}-1debian10_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_${VERSION}-1debian10_amd64.deb /tmp/mysql-server_${VERSION}-1debian10_amd64.deb
-    PACKAGES=(
-        /tmp/libmysqlclient20_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-community-client_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-client_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-community-server_${VERSION}-1debian10_amd64.deb
-        /tmp/mysql-server_${VERSION}-1debian10_amd64.deb
-        mysql-shell
-        percona-xtrabackup-24
-    )
-    ;;
 mysql80)
     if [ -z "$VERSION" ]; then
-        VERSION=8.0.30
+        VERSION=8.0.40
     fi
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${VERSION}-1debian11_amd64.deb /tmp/mysql-common_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${VERSION}-1debian11_amd64.deb /tmp/libmysqlclient21_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${VERSION}-1debian11_amd64.deb /tmp/mysql-community-client-core_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${VERSION}-1debian11_amd64.deb /tmp/mysql-community-client-plugins_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${VERSION}-1debian11_amd64.deb /tmp/mysql-community-client_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${VERSION}-1debian11_amd64.deb /tmp/mysql-client_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${VERSION}-1debian11_amd64.deb /tmp/mysql-community-server-core_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${VERSION}-1debian11_amd64.deb /tmp/mysql-community-server_${VERSION}-1debian11_amd64.deb
-    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${VERSION}-1debian11_amd64.deb /tmp/mysql-server_${VERSION}-1debian11_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-common_${VERSION}-1debian12_amd64.deb /tmp/mysql-common_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${VERSION}-1debian12_amd64.deb /tmp/libmysqlclient21_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${VERSION}-1debian12_amd64.deb /tmp/mysql-community-client-core_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${VERSION}-1debian12_amd64.deb /tmp/mysql-community-client-plugins_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${VERSION}-1debian12_amd64.deb /tmp/mysql-community-client_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${VERSION}-1debian12_amd64.deb /tmp/mysql-client_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${VERSION}-1debian12_amd64.deb /tmp/mysql-community-server-core_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${VERSION}-1debian12_amd64.deb /tmp/mysql-community-server_${VERSION}-1debian12_amd64.deb
+    do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${VERSION}-1debian12_amd64.deb /tmp/mysql-server_${VERSION}-1debian12_amd64.deb
     PACKAGES=(
-        /tmp/mysql-common_${VERSION}-1debian11_amd64.deb
-        /tmp/libmysqlclient21_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-community-client-core_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-community-client-plugins_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-community-client_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-client_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-community-server-core_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-community-server_${VERSION}-1debian11_amd64.deb
-        /tmp/mysql-server_${VERSION}-1debian11_amd64.deb
+        /tmp/mysql-common_${VERSION}-1debian12_amd64.deb
+        /tmp/libmysqlclient21_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-community-client-core_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-community-client-plugins_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-community-client_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-client_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-community-server-core_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-community-server_${VERSION}-1debian12_amd64.deb
+        /tmp/mysql-server_${VERSION}-1debian12_amd64.deb
         mysql-shell
         percona-xtrabackup-80
     )
     ;;
-percona)
-    PACKAGES=(
-        libcurl3
-        percona-server-server-5.6
-        percona-xtrabackup
-    )
-    ;;
-percona57)
-    PACKAGES=(
-        libperconaserverclient20
-        percona-server-server-5.7
-        percona-xtrabackup-24
-    )
-    ;;
 percona80)
     PACKAGES=(
         libperconaserverclient21
@@ -155,39 +122,24 @@ add_apt_key 9334A25F8507EFA5
 
 # Add extra apt repositories for MySQL.
 case "${FLAVOR}" in
-mysql57)
-    echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list
-    ;;
 mysql80)
-    echo 'deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list
+    echo 'deb http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' > /etc/apt/sources.list.d/mysql.list
     ;;
 esac
 
 # Add extra apt repositories for Percona Server and/or Percona XtraBackup.
 case "${FLAVOR}" in
-mysql57)
-    echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list
-    ;;
-mysql80|percona57)
-    echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list
+mysql80)
+    echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list
     ;;
 percona80)
-    echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list
-    echo 'deb http://repo.percona.com/ps-80/apt bullseye main' > /etc/apt/sources.list.d/percona80.list
+    echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list
+    echo 'deb http://repo.percona.com/ps-80/apt bookworm main' > /etc/apt/sources.list.d/percona80.list
     ;;
 esac
 
 # Pre-fill values for installation prompts that are normally interactive.
 case "${FLAVOR}" in
-percona57)
-    debconf-set-selections <<EOF
-debconf debconf/frontend select Noninteractive
-percona-server-server-5.7 percona-server-server/root_password password 'unused'
-percona-server-server-5.7 percona-server-server/root_password_again password 'unused'
-percona-server-server-5.7 percona-server-server-5.7/root-pass password 'unused'
-percona-server-server-5.7 percona-server-server-5.7/re-root-pass password 'unused'
-EOF
-    ;;
 percona80)
     debconf-set-selections <<EOF
 debconf debconf/frontend select Noninteractive

diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.5-bookworm AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
@@ -31,7 +31,7 @@ COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
 RUN make install-testing PREFIX=/vt/install
 
 # Start over and build the final image.
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
 # Install dependencies
 COPY docker/utils/install_dependencies.sh /vt/dist/install_dependencies.sh
@@ -56,4 +56,4 @@ USER vitess
 COPY docker/vttestserver/setup_vschema_folder.sh /vt/setup_vschema_folder.sh
 COPY docker/vttestserver/run.sh /vt/run.sh
 
-CMD /vt/run.sh "8.0.30-Vitess"
+CMD /vt/run.sh "8.0.40-Vitess"
diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.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/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml
@@ -12,7 +12,7 @@ spec:
     vtorc: vitess/lite:latest
     mysqld:
       mysql80Compatible: vitess/lite:latest
-    mysqldExporter: prom/mysqld-exporter:v0.11.0
+    mysqldExporter: prom/mysqld-exporter:v0.14.0
   cells:
   - name: zone1
     gateway:

diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml
@@ -12,7 +12,7 @@ spec:
     vtorc: vitess/lite:latest
     mysqld:
       mysql80Compatible: vitess/lite:latest
-    mysqldExporter: prom/mysqld-exporter:v0.11.0
+    mysqldExporter: prom/mysqld-exporter:v0.14.0
   cells:
   - name: zone1
     gateway:

diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml
@@ -12,7 +12,7 @@ spec:
     vtorc: vitess/lite:latest
     mysqld:
       mysql80Compatible: vitess/lite:latest
-    mysqldExporter: prom/mysqld-exporter:v0.11.0
+    mysqldExporter: prom/mysqld-exporter:v0.14.0
   cells:
   - name: zone1
     gateway:

diff --git a/examples/operator/401_scheduled_backups.yaml b/examples/operator/401_scheduled_backups.yaml
@@ -53,7 +53,7 @@ spec:
     vtorc: vitess/lite:latest
     mysqld:
       mysql80Compatible: vitess/lite:latest
-    mysqldExporter: prom/mysqld-exporter:v0.11.0
+    mysqldExporter: prom/mysqld-exporter:v0.14.0
   cells:
   - name: zone1
     gateway:

diff --git a/go/flags/endtoend/mysqlctl.txt b/go/flags/endtoend/mysqlctl.txt
@@ -71,7 +71,7 @@ Flags:
       --logtostderr                                                 log to standard error instead of files
       --max-stack-size int                                          configure the maximum stack size in bytes (default 67108864)
       --mysql_port int                                              MySQL port. (default 3306)
-      --mysql_server_version string                                 MySQL server version to advertise. (default "8.0.30-Vitess")
+      --mysql_server_version string                                 MySQL server version to advertise. (default "8.0.40-Vitess")
       --mysql_socket string                                         Path to the mysqld socket file.
       --mysqlctl_client_protocol string                             the protocol to use to talk to the mysqlctl server (default "grpc")
       --mysqlctl_mycnf_template string                              template file to use for generating the my.cnf file during server init

diff --git a/go/flags/endtoend/mysqlctld.txt b/go/flags/endtoend/mysqlctld.txt
@@ -99,7 +99,7 @@ Flags:
       --logtostderr                                                      log to standard error instead of files
       --max-stack-size int                                               configure the maximum stack size in bytes (default 67108864)
       --mysql_port int                                                   MySQL port (default 3306)
-      --mysql_server_version string                                      MySQL server version to advertise. (default "8.0.30-Vitess")
+      --mysql_server_version string                                      MySQL server version to advertise. (default "8.0.40-Vitess")
       --mysql_socket string                                              Path to the mysqld socket file
       --mysqlctl_mycnf_template string                                   template file to use for generating the my.cnf file during server init
       --mysqlctl_socket string                                           socket file to use for remote mysqlctl actions (empty for local actions)