File tree Expand file tree Collapse file tree 3 files changed +5
-16
lines changed
dev/preview/workflow/preview
components/database/incluster Expand file tree Collapse file tree 3 files changed +5
-16
lines changed Original file line number Diff line number Diff line change @@ -483,11 +483,6 @@ yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.enforce
483
483
yq w -i " ${INSTALLER_CONFIG_PATH} " experimental.workspace.networkLimits.connectionsPerMinute " 3000"
484
484
yq w -i " ${INSTALLER_CONFIG_PATH} " experimental.workspace.networkLimits.bucketSize " 3000"
485
485
486
- #
487
- # Configure DB
488
- #
489
- yq w -i " ${INSTALLER_CONFIG_PATH} " database.inClusterMySql_8_0 " true"
490
-
491
486
log_success " Generated config at $INSTALLER_CONFIG_PATH "
492
487
493
488
# ========
Original file line number Diff line number Diff line change @@ -33,15 +33,11 @@ var Helm = common.CompositeHelmFunc(
33
33
Value string `json:"value,omitempty"`
34
34
}
35
35
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
+ })
45
41
extraEnvVarsBytes , err := yaml .Marshal (extraEnvVars )
46
42
if err != nil {
47
43
return nil , err
Original file line number Diff line number Diff line change @@ -195,8 +195,6 @@ type Database struct {
195
195
External * DatabaseExternal `json:"external,omitempty"`
196
196
CloudSQL * DatabaseCloudSQL `json:"cloudSQL,omitempty"`
197
197
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"`
200
198
}
201
199
202
200
type DatabaseExternal struct {
You can’t perform that action at this time.
0 commit comments