Rename algorithm deployment and service

pkg/controller.v1alpha3/suggestion/composer/composer.go

@@ -54,7 +54,7 @@ func (g *General) DesiredDeployment(s *suggestionsv1alpha3.Suggestion) (*appsv1.
 	}
 	d := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
+			Name:      util.GetAlgorithmDeploymentName(s),
 			Namespace: s.Namespace,
 		},
 		Spec: appsv1.DeploymentSpec{
@@ -90,7 +90,7 @@ func (g *General) DesiredService(s *suggestionsv1alpha3.Suggestion) (*corev1.Ser
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name,
+			Name:      util.GetAlgorithmServiceName(s),
 			Namespace: s.Namespace,
 		},
 		Spec: corev1.ServiceSpec{

pkg/controller.v1alpha3/suggestion/suggestion_controller_test.go

@@ -39,7 +39,7 @@ import (
 var c client.Client
 
 var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: "default"}}
-var depKey = types.NamespacedName{Name: "foo", Namespace: "default"}
+var depKey = types.NamespacedName{Name: "foo-random", Namespace: "default"}
 
 const timeout = time.Second * 5
 
@@ -104,7 +104,7 @@ func TestReconcile(t *testing.T) {
 
 	// Manually delete Deployment since GC isn't enabled in the test control plane
 	g.Eventually(func() error { return c.Delete(context.TODO(), deploy) }, timeout).
-		Should(gomega.MatchError("deployments.apps \"foo\" not found"))
+		Should(gomega.MatchError("deployments.apps \"foo-random\" not found"))
 
 }
 

pkg/controller.v1alpha3/suggestion/suggestionclient/suggestionclient.go

@@ -18,6 +18,7 @@ import (
 	trialsv1alpha3 "github.com/kubeflow/katib/pkg/apis/controller/trials/v1alpha3"
 	suggestionapi "github.com/kubeflow/katib/pkg/apis/manager/v1alpha3"
 	"github.com/kubeflow/katib/pkg/controller.v1alpha3/consts"
+	"github.com/kubeflow/katib/pkg/controller.v1alpha3/util"
 )
 
 var (
@@ -53,7 +54,7 @@ func (g *General) SyncAssignments(
 		return nil
 	}
 
-	endpoint := fmt.Sprintf("%s:%d", instance.Name, consts.DefaultSuggestionPort)
+	endpoint := util.GetAlgorithmEndpoint(instance)
 	conn, err := grpc.Dial(endpoint, grpc.WithInsecure())
 	if err != nil {
 		return err

pkg/controller.v1alpha3/util/labels.go

@@ -8,7 +8,7 @@ import (
 
 func SuggestionLabels(instance *suggestionsv1alpha3.Suggestion) map[string]string {
 	return map[string]string{
-		"deployment":               instance.Name,
+		"deployment":               GetAlgorithmDeploymentName(instance),
 		consts.LabelExperimentName: instance.Name,
 		consts.LabelSuggestionName: instance.Name,
 	}

pkg/controller.v1alpha3/util/suggestion.go

@@ -0,0 +1,21 @@
+package util
+
+import (
+	"fmt"
+
+	suggestionsv1alpha3 "github.com/kubeflow/katib/pkg/apis/controller/suggestions/v1alpha3"
+	"github.com/kubeflow/katib/pkg/controller.v1alpha3/consts"
+)
+
+func GetAlgorithmDeploymentName(s *suggestionsv1alpha3.Suggestion) string {
+	return s.Name + "-" + s.Spec.AlgorithmName
+}
+
+func GetAlgorithmServiceName(s *suggestionsv1alpha3.Suggestion) string {
+	return s.Name + "-" + s.Spec.AlgorithmName
+}
+
+func GetAlgorithmEndpoint(s *suggestionsv1alpha3.Suggestion) string {
+	serviceName := GetAlgorithmServiceName(s)
+	return fmt.Sprintf("%s:%d", serviceName, consts.DefaultSuggestionPort)
+}