Skip to content

Commit 19dcde4

Browse files
authored
[db] inCluster: remove mysql version flag (#18740)
1 parent 0189623 commit 19dcde4

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,6 @@ yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.enforce
483483
yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.connectionsPerMinute "3000"
484484
yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.bucketSize "3000"
485485

486-
#
487-
# Configure DB
488-
#
489-
yq w -i "${INSTALLER_CONFIG_PATH}" database.inClusterMySql_8_0 "true"
490-
491486
log_success "Generated config at $INSTALLER_CONFIG_PATH"
492487

493488
# ========

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@ var Helm = common.CompositeHelmFunc(
3333
Value string `json:"value,omitempty"`
3434
}
3535
extraEnvVars := []EnvVar{}
36-
// MySQL 5.7: We switched to specific tags because we got subtle broken versions with just specifying major versions
37-
mysqlBitnamiImageTag := "5.7.34-debian-10-r55"
38-
if cfg.Config.Database.InClusterMysSQL_8_0 {
39-
mysqlBitnamiImageTag = "8.0.33-debian-11-r24"
40-
extraEnvVars = append(extraEnvVars, EnvVar{
41-
Name: "MYSQL_AUTHENTICATION_PLUGIN",
42-
Value: "mysql_native_password",
43-
})
44-
}
36+
mysqlBitnamiImageTag := "8.0.33-debian-11-r24"
37+
extraEnvVars = append(extraEnvVars, EnvVar{
38+
Name: "MYSQL_AUTHENTICATION_PLUGIN",
39+
Value: "mysql_native_password",
40+
})
4541
extraEnvVarsBytes, err := yaml.Marshal(extraEnvVars)
4642
if err != nil {
4743
return nil, err

install/installer/pkg/config/v1/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ type Database struct {
195195
External *DatabaseExternal `json:"external,omitempty"`
196196
CloudSQL *DatabaseCloudSQL `json:"cloudSQL,omitempty"`
197197
SSL *SSLOptions `json:"ssl,omitempty"`
198-
// A temporary flag to help debug for the migration to MySQL 8.0
199-
InClusterMysSQL_8_0 bool `json:"inClusterMySql_8_0,omitempty"`
200198
}
201199

202200
type DatabaseExternal struct {

0 commit comments

Comments
 (0)