katib should be able to be deployed in any namespace (#324)

kubeflow · Jan 15, 2019 · 4a69776 · 4a69776
1 parent 3c37f31
commit 4a69776
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/cmd/metricscollector/main.go b/cmd/metricscollector/main.go
@@ -42,7 +42,6 @@ import (
 	"flag"
 	"log"
 
-	"github.com/kubeflow/katib/pkg"
 	api "github.com/kubeflow/katib/pkg/api"
 	"github.com/kubeflow/katib/pkg/manager/metricscollector"
 
@@ -54,11 +53,12 @@ var trialID = flag.String("t", "", "Trial ID")
 var workerID = flag.String("w", "", "Worker ID")
 var workerKind = flag.String("k", "", "Worker Kind")
 var namespace = flag.String("n", "", "NameSpace")
+var managerSerivce = flag.String("m", "", "Vizier Manager service")
 
 func main() {
 	flag.Parse()
 	log.Printf("Study ID: %s, Trial ID: %s, Worker ID: %s, Worker Kind: %s", *studyID, *trialID, *workerID, *workerKind)
-	conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
+	conn, err := grpc.Dial(*managerSerivce, grpc.WithInsecure())
 	if err != nil {
 		log.Fatalf("could not connect: %v", err)
 	}

diff --git a/manifests/studyjobcontroller/metricsControllerConfigMap.yaml b/manifests/studyjobcontroller/metricsControllerConfigMap.yaml
@@ -34,4 +34,6 @@ data:
                 - "{{.WorkerKind}}"
                 - "-n"
                 - "{{.NameSpace}}"
+                - "-m"
+                - "{{.ManagerSerivce}}"
               restartPolicy: Never
diff --git a/manifests/studyjobcontroller/studyjobcontroller.yaml b/manifests/studyjobcontroller/studyjobcontroller.yaml
@@ -21,3 +21,8 @@ spec:
       - name: studyjob-controller
         image: katib/studyjob-controller
         imagePullPolicy: Always
+        env:
+        - name: VIZIER_CORE_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
diff --git a/pkg/controller/studyjob/manifest_parser.go b/pkg/controller/studyjob/manifest_parser.go
@@ -23,6 +23,7 @@ import (
 
 	katibapi "github.com/kubeflow/katib/pkg/api"
 	katibv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
+	"github.com/kubeflow/katib/pkg"
 	"github.com/kubeflow/katib/pkg/manager/studyjobclient"
 
 	"k8s.io/apimachinery/pkg/util/uuid"
@@ -147,6 +148,7 @@ func getMetricsCollectorManifest(studyID string, trialID string, workerID string
 		"WorkerID":   workerID,
 		"WorkerKind": workerKind,
 		"NameSpace":  namespace,
+		"ManagerSerivce": pkg.GetManagerAddr(),
 	}
 	mctp := "defaultMetricsCollectorTemplate.yaml"
 	if mcs != nil {

diff --git a/pkg/types.go b/pkg/types.go
@@ -1,5 +1,29 @@
 package pkg
 
+import (
+	"os"
+)
+
 const (
-	ManagerAddr = "vizier-core.kubeflow:6789"
+	VizierServiceIPEnvName = "VIZIER_CORE_PORT_6789_TCP_ADDR"
+	VizierServicePortEnvName = "VIZIER_CORE_PORT_6789_TCP_PORT"
+	VizierServiceNamespaceEnvName = "VIZIER_CORE_NAMESPACE"
+	VizierService = "vizier-core"
+	VizierPort = "6789"
+	ManagerAddr = VizierService + ":" + VizierPort
 )
+
+func GetManagerAddr() string {
+	ns := os.Getenv(VizierServiceNamespaceEnvName)
+	if len(ns) == 0 {
+		addr := os.Getenv(VizierServiceIPEnvName)
+		port := os.Getenv(VizierServicePortEnvName)
+		if len(addr) > 0 && len(port) > 0 {
+			return addr + ":" + port
+		} else {
+			return ManagerAddr
+		}
+	} else {
+		return VizierService + "." + ns + ":"+ VizierPort
+	}
+}