diff --git a/dev/preview/workflow/preview/deploy-gitpod.sh b/dev/preview/workflow/preview/deploy-gitpod.sh index 5f0e29c210d834..febef2bbf203e4 100755 --- a/dev/preview/workflow/preview/deploy-gitpod.sh +++ b/dev/preview/workflow/preview/deploy-gitpod.sh @@ -483,11 +483,6 @@ 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 index e6cbdb9a089720..4ced2adfaed18e 100644 --- a/install/installer/pkg/components/database/incluster/helm.go +++ b/install/installer/pkg/components/database/incluster/helm.go @@ -33,15 +33,11 @@ var Helm = common.CompositeHelmFunc( Value string `json:"value,omitempty"` } extraEnvVars := []EnvVar{} - // MySQL 5.7: 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 = append(extraEnvVars, EnvVar{ - Name: "MYSQL_AUTHENTICATION_PLUGIN", - Value: "mysql_native_password", - }) - } + mysqlBitnamiImageTag = "8.0.33-debian-11-r24" + extraEnvVars = append(extraEnvVars, EnvVar{ + Name: "MYSQL_AUTHENTICATION_PLUGIN", + Value: "mysql_native_password", + }) extraEnvVarsBytes, err := yaml.Marshal(extraEnvVars) if err != nil { return nil, err diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go index 3ab3c2b92670b6..c8da8f208e3c3a 100644 --- a/install/installer/pkg/config/v1/config.go +++ b/install/installer/pkg/config/v1/config.go @@ -195,8 +195,6 @@ 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 {