[db] Run test against the same (bitnami/)mysql:8.0.33 version

Author: geropl

.github/workflows/build.yml

@@ -142,10 +142,11 @@ jobs:
       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
     services:
       mysql:
-        image: mysql:5.7
+        image: bitnami/mysql:8.0.33-debian-11-r24
         env:
           MYSQL_ROOT_PASSWORD: test
           MYSQL_TCP_PORT: 23306
+          MYSQL_AUTHENTICATION_PLUGIN: mysql_native_password
         ports:
           - 23306:23306
     container:

components/gitpod-db/BUILD.yaml

@@ -63,7 +63,8 @@ packages:
         # Check if a DB is present. If not: start one and wait until it's up
         # Note: In CI there is a DB running as sidecar; in workspaces we're starting it once.
         #       Re-use of the instance because of the init scripts (cmp. next step).
-        - ["sh", "-c", "mysqladmin ping -h $DB_HOST --port $DB_PORT -p$DB_PASSWORD -u$DB_USER --silent || (docker run --name test-mysql -d -e MYSQL_ROOT_PASSWORD=$DB_PASSWORD -e MYSQL_TCP_PORT=$DB_PORT -p $DB_PORT:$DB_PORT mysql:5.7; while ! mysqladmin ping -h \"$DB_HOST\" -P \"$DB_PORT\" -p$DB_PASSWORD -u$DB_USER --silent; do echo \"waiting for DB...\"; sleep 2; done)"]
+        # TODO(gpl) Would be awesome to run the exact bitnami/mysql image we run in preview, but it does not run in Gitpod workspaces. Falling back to plain mysql, then
+        - ["sh", "-c", "mysqladmin ping -h $DB_HOST --port $DB_PORT -p$DB_PASSWORD -u$DB_USER --silent || (docker run --name test-mysql -d -e MYSQL_ROOT_PASSWORD=$DB_PASSWORD -e MYSQL_TCP_PORT=$DB_PORT -p $DB_PORT:$DB_PORT mysql:8.0.33 --default-authentication-plugin=mysql_native_password; while ! mysqladmin ping -h \"$DB_HOST\" -P \"$DB_PORT\" -p$DB_PASSWORD -u$DB_USER --silent; do echo \"waiting for DB...\"; sleep 2; done)"]
         # Apply the DB initialization scripts (re-creates the "gitpod" DB if already there)
         - ["mkdir", "-p", "init-scripts"]
         - ["sh", "-c", "find . -name \"*.sql\" | sort | xargs -I file cp file init-scripts"]

install/installer/pkg/components/database/incluster/helm.go

@@ -26,10 +26,12 @@ var Helm = common.CompositeHelmFunc(
 
 		imageRegistry := common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)
 
+		extraEnvVars := map[string]string{}
 		// We switched to specific tags because we got subtle broken versions with just specifying major versions
 		mysqlBitnamiImageTag := "5.7.34-debian-10-r55"
 		if cfg.Config.Database.InClusterMysSQL_8_0 {
 			mysqlBitnamiImageTag = "8.0.33-debian-11-r24"
+			extraEnvVars["MYSQL_AUTHENTICATION_PLUGIN"] = "mysql_native_password"
 		}
 
 		return &common.HelmConfig{
@@ -49,6 +51,7 @@ var Helm = common.CompositeHelmFunc(
 					helm.ImagePullSecrets("mysql.volumePermissions.image.pullSecrets", cfg),
 					helm.KeyValue("mysql.volumePermissions.image.pullPolicy", "IfNotPresent"),
 					helm.KeyValue("mysql.volumePermissions.image.registry", imageRegistry),
+					helm.KeyValueArray("mysql.primary.extraEnvVars", extraEnvVars),
 
 					// improve start time
 					helm.KeyValue("mysql.primary.startupProbe.enabled", "false"),

install/installer/pkg/helm/common.go

@@ -6,15 +6,27 @@ package helm
 
 import (
 	"fmt"
-	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"os"
+	"strings"
+
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
 )
 
 // KeyValue ensure that a key/value pair is correctly formatted for Values
 func KeyValue(key string, value string) string {
 	return fmt.Sprintf("%s=%s", key, value)
 }
 
+// KeyValueArray ensure that a key/value pair is correctly formatted for Values
+func KeyValueArray(key string, envs map[string]string) string {
+	var envVarList []string
+	for n, v := range envs {
+		envVar := KeyValue(n, v)
+		envVarList = append(envVarList, envVar)
+	}
+	return KeyValue(key, strings.Join(envVarList, ","))
+}
+
 // KeyFileValue ensure that a key/value pair is correctly formatted for FileValues
 func KeyFileValue(key string, data []byte) (string, error) {
 	dir, err := os.MkdirTemp("", "helm")