Fix katib-manager crash in kubeflow cluster (#900)

kubeflow · Oct 28, 2019 · 606736d · 606736d
1 parent 0eadfce
commit 606736d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pkg/db/v1alpha3/common/const.go b/pkg/db/v1alpha3/common/const.go
@@ -7,8 +7,8 @@ const (
 
  DBPasswordEnvName = "DB_PASSWORD"
 
- MySQLDBHostEnvName = "MYSQL_HOST"
- MySQLDBPortEnvName = "MYSQL_PORT"
+ MySQLDBHostEnvName = "KATIB_MYSQL_HOST"
+ MySQLDBPortEnvName = "KATIB_MYSQL_PORT"
 
  DefaultMySQLHost = "katib-db"
  DefaultMySQLPort = "3306"

diff --git a/pkg/db/v1alpha3/mysql/mysql.go b/pkg/db/v1alpha3/mysql/mysql.go
@@ -14,13 +14,12 @@ import (
 
  v1alpha3 "github.com/kubeflow/katib/pkg/apis/manager/v1alpha3"
  "github.com/kubeflow/katib/pkg/db/v1alpha3/common"
- //"github.com/kubeflow/katib/pkg/util/v1alpha3/env"
+ "github.com/kubeflow/katib/pkg/util/v1alpha3/env"
 )
 
 const (
- dbDriver = "mysql"
- dbNameTmpl = "root:%s@tcp(katib-db:3306)/katib?timeout=5s"
- //dbNameTmpl = "root:%s@tcp(%s:%s)/katib?timeout=5s"
+ dbDriver = "mysql"
+ dbNameTmpl = "root:%s@tcp(%s:%s)/katib?timeout=5s"
  mysqlTimeFmt = "2006-01-02 15:04:05.999999"
 
  connectInterval = 5 * time.Second
@@ -34,11 +33,12 @@ type dbConn struct {
 func getDbName() string {
  dbPassEnvName := common.DBPasswordEnvName
  dbPass := os.Getenv(dbPassEnvName)
- //dbHost := env.GetEnvOrDefault(
- // common.MySQLDBHostEnvName, common.DefaultMySQLHost)
- //dbPort := env.GetEnvOrDefault(
- // common.MySQLDBPortEnvName, common.DefaultMySQLPort)
- return fmt.Sprintf(dbNameTmpl, dbPass)
+ dbHost := env.GetEnvOrDefault(
+ common.MySQLDBHostEnvName, common.DefaultMySQLHost)
+ dbPort := env.GetEnvOrDefault(
+ common.MySQLDBPortEnvName, common.DefaultMySQLPort)
+
+ return fmt.Sprintf(dbNameTmpl, dbPass, dbHost, dbPort)
 }
 
 func openSQLConn(driverName string, dataSourceName string, interval time.Duration,