[installer] Optional flag to use mysql 8.0 (#18069)

gitpod-io · Jun 27, 2023 · 943f630 · 943f630
1 parent 8a2df3b
commit 943f630
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/dev/preview/workflow/preview/deploy-gitpod.sh b/dev/preview/workflow/preview/deploy-gitpod.sh
@@ -493,6 +493,11 @@ yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.enforce
 yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.connectionsPerMinute "3000"
 yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.bucketSize "3000"
 
+#
+# Configure DB
+#
+yq w -i "${INSTALLER_CONFIG_PATH}" database.inClusterMySql_8_0 "true"
+
 log_success "Generated config at $INSTALLER_CONFIG_PATH"
 
 # ========

diff --git a/install/installer/pkg/components/database/incluster/helm.go b/install/installer/pkg/components/database/incluster/helm.go
@@ -26,10 +26,17 @@ var Helm = common.CompositeHelmFunc(
 
 		imageRegistry := common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)
 
+		// 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"
+		}
+
 		return &common.HelmConfig{
 			Enabled: true,
 			Values: &values.Options{
 				Values: []string{
+					helm.KeyValue("mysql.image.tag", mysqlBitnamiImageTag),
 					helm.KeyValue("mysql.auth.existingSecret", SQLPasswordName),
 					helm.KeyValue("mysql.auth.database", Database),
 					helm.KeyValue("mysql.auth.username", Username),

diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go
@@ -196,6 +196,8 @@ type Database struct {
 	External  *DatabaseExternal `json:"external,omitempty"`
 	CloudSQL  *DatabaseCloudSQL `json:"cloudSQL,omitempty"`
 	SSL       *SSLOptions       `json:"ssl,omitempty"`
+	// A temporary flag to help debug for the migration to MySQL 8.0
+	InClusterMysSQL_8_0 bool `json:"inClusterMySql_8_0,omitempty"`
 }
 
 type DatabaseExternal struct {

diff --git a/install/installer/third_party/charts/mysql/values.yaml b/install/installer/third_party/charts/mysql/values.yaml
@@ -5,8 +5,7 @@
 mysql:
   fullnameOverride: mysql
   image:
-    # We switched to the specific version because "5.7" was broken at least once
-    tag: 5.7.34-debian-10-r55
+    tag: "overwritten"
   primary:
     extraEnvVars:
       # We rely on this in our DB implementations: NULL (re-)sets configured columns to be initialized with CURRENT_TIMESTAMP.