Fix custom Katib DB Manager env variables (kubeflow#1102)

* Fix custom Katib DB Manager info

* Change names for Katib db manager env

pkg/common/v1alpha3/katib_manager_util.go

@@ -17,40 +17,29 @@ package v1alpha3
 
 import (
 	"context"
-	"os"
 
 	"google.golang.org/grpc"
 
 	api_pb "github.com/kubeflow/katib/pkg/apis/manager/v1alpha3"
 	"github.com/kubeflow/katib/pkg/controller.v1alpha3/consts"
 )
 
-const (
-	KatibDBManagerServiceIPEnvName   = "KATIB_DB_MANAGER_PORT_6789_TCP_ADDR"
-	KatibDBManagerServicePortEnvName = "KATIB_DB_MANAGER_PORT_6789_TCP_PORT"
-	KatibDBManagerService            = "katib-db-manager"
-	KatibDBManagerPort               = "6789"
-	KatibDBManagerAddr               = KatibDBManagerService + ":" + KatibDBManagerPort
-)
-
 type katibDBManagerClientAndConn struct {
 	Conn                 *grpc.ClientConn
 	KatibDBManagerClient api_pb.ManagerClient
 }
 
+// GetDBManagerAddr returns address of Katib DB Manager
 func GetDBManagerAddr() string {
-	ns := consts.DefaultKatibNamespace
-	if len(ns) == 0 {
-		addr := os.Getenv(KatibDBManagerServiceIPEnvName)
-		port := os.Getenv(KatibDBManagerServicePortEnvName)
-		if len(addr) > 0 && len(port) > 0 {
-			return addr + ":" + port
-		} else {
-			return KatibDBManagerAddr
-		}
-	} else {
-		return KatibDBManagerService + "." + ns + ":" + KatibDBManagerPort
+	dbManagerNS := consts.DefaultKatibDBManagerServiceNamespace
+	dbManagerIP := consts.DefaultKatibDBManagerServiceIP
+	dbManagerPort := consts.DefaultKatibDBManagerServicePort
+
+	if len(dbManagerNS) != 0 {
+		return dbManagerIP + "." + dbManagerNS + ":" + dbManagerPort
 	}
+
+	return dbManagerIP + ":" + dbManagerPort
 }
 
 func getKatibDBManagerClientAndConn() (*katibDBManagerClientAndConn, error) {

pkg/controller.v1alpha3/consts/const.go

@@ -40,6 +40,13 @@ const (
 	// DefaultKatibComposerEnvName is the default env name of katib suggestion composer
 	DefaultKatibComposerEnvName = "KATIB_SUGGESTION_COMPOSER"
 
+	// DefaultKatibDBManagerServiceNamespaceEnvName is the env name of Katib DB Manager namespace
+	DefaultKatibDBManagerServiceNamespaceEnvName = "KATIB_DB_MANAGER_SERVICE_NAMESPACE"
+	// DefaultKatibDBManagerServiceIPEnvName is the env name of Katib DB Manager IP
+	DefaultKatibDBManagerServiceIPEnvName = "KATIB_DB_MANAGER_SERVICE_IP"
+	// DefaultKatibDBManagerServicePortEnvName is the env name of Katib DB Manager Port
+	DefaultKatibDBManagerServicePortEnvName = "KATIB_DB_MANAGER_SERVICE_PORT"
+
 	// KatibConfigMapName is the config map constants
 	// Configmap name which includes Katib's configuration
 	KatibConfigMapName = "katib-config"
@@ -117,7 +124,9 @@ const (
 	// AnnotationIstioSidecarInjectValue is the value of Istio Sidecar annotation
 	AnnotationIstioSidecarInjectValue = "false"
 
-	LabelTrialTemplateConfigMapName  = "app"
+	// LabelTrialTemplateConfigMapName is the label name for the Trial templates configMap
+	LabelTrialTemplateConfigMapName = "app"
+	// LabelTrialTemplateConfigMapValue is the label value for the Trial templates configMap
 	LabelTrialTemplateConfigMapValue = "katib-trial-templates"
 )
 
@@ -126,4 +135,11 @@ var (
 	DefaultKatibNamespace = env.GetEnvOrDefault(DefaultKatibNamespaceEnvName, "kubeflow")
 	// DefaultComposer is the default composer of katib suggestion.
 	DefaultComposer = env.GetEnvOrDefault(DefaultKatibComposerEnvName, "General")
+
+	// DefaultKatibDBManagerServiceNamespace is the default namespace of Katib DB Manager
+	DefaultKatibDBManagerServiceNamespace = env.GetEnvOrDefault(DefaultKatibDBManagerServiceNamespaceEnvName, DefaultKatibNamespace)
+	// DefaultKatibDBManagerServiceIP is the default IP of Katib DB Manager
+	DefaultKatibDBManagerServiceIP = env.GetEnvOrDefault(DefaultKatibDBManagerServiceIPEnvName, "katib-db-manager")
+	// DefaultKatibDBManagerServicePort is the default Port of Katib DB Manager
+	DefaultKatibDBManagerServicePort = env.GetEnvOrDefault(DefaultKatibDBManagerServicePortEnvName, "6789")
 )

pkg/ui/v1alpha3/backend.go

@@ -28,7 +28,7 @@ func NewKatibUIHandler() *KatibUIHandler {
 }
 
 func (k *KatibUIHandler) connectManager() (*grpc.ClientConn, api_pb_v1alpha3.ManagerClient) {
-	conn, err := grpc.Dial(common_v1alpha3.KatibDBManagerAddr, grpc.WithInsecure())
+	conn, err := grpc.Dial(common_v1alpha3.GetDBManagerAddr(), grpc.WithInsecure())
 	if err != nil {
 		log.Printf("Dial to GRPC failed: %v", err)
 		return nil, nil