K8s - MariaDB - Upgrade to 11.1

GoogleCloudPlatform · Sep 26, 2023 · 69e6adf · 69e6adf
1 parent b20d828
commit 69e6adf
Show file tree

Hide file tree

Showing 6 changed files with 306 additions and 302 deletions.
diff --git a/k8s/mariadb/Makefile b/k8s/mariadb/Makefile
@@ -8,7 +8,7 @@ APP_ID ?= $(CHART_NAME)
 
 VERIFY_WAIT_TIMEOUT = 1800
 
-TRACK ?= 11.0
+TRACK ?= 11.1
 METRICS_EXPORTER_TAG ?= v0.5.1
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google

diff --git a/k8s/mariadb/apptest/tester/tests/basic-suite.yaml b/k8s/mariadb/apptest/tester/tests/basic-suite.yaml
@@ -1,29 +1,29 @@
 actions:
 - name: Can connect to a database (as root user)
   bashTest:
-    script: mysql -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "SHOW DATABASES"
+    script: mariadb -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "SHOW DATABASES"
     expect:
       stdout:
         contains: information_schema
       exitCode:
         equals: 0
 - name: Can not connect to a database with incorrect credentials
   bashTest:
-    script: mysql -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"wrong_pass" -e "SHOW DATABASES"
+    script: mariadb -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"wrong_pass" -e "SHOW DATABASES"
     expect:
       stderr:
         contains: 'ERROR 1045 (28000): Access denied for user '
       exitCode:
         equals: 1
 - name: Can create database
   bashTest:
-    script: mysql -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "CREATE DATABASE test_database"
+    script: mariadb -h ${APP_INSTANCE_NAME}-mariadb.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "CREATE DATABASE test_database"
     expect:
       exitCode:
         equals: 0
 - name: Check replication
   bashTest:
-    script: mysql -h ${APP_INSTANCE_NAME}-mariadb-secondary.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "SHOW DATABASES"
+    script: mariadb -h ${APP_INSTANCE_NAME}-mariadb-secondary.${NAMESPACE}.svc.cluster.local -u root -p"${MYSQL_ROOT_PASSWORD}" -e "SHOW DATABASES"
     expect:
       stdout:
         contains: test_database

diff --git a/k8s/mariadb/chart/mariadb/templates/manifests.yaml b/k8s/mariadb/chart/mariadb/templates/manifests.yaml