Add namespace to service name inside the apiserver's store

kuberlogic · Oct 19, 2021 · 509ccbb · 509ccbb
1 parent 062e174
commit 509ccbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/modules/apiserver/internal/store/service_util.go b/modules/apiserver/internal/store/service_util.go
@@ -98,15 +98,15 @@ func getServiceInternalConnection(c *kubernetes.Clientset, log logging.Logger, k
 
 	svc.Master = &models.Connection{
 		Cert:     "",
-		Host:     masterSvc,
+		Host:     masterSvc + "." + kls.Namespace,
 		Password: password,
 		Port:     int64(port),
 		SslMode:  "",
 		User:     user,
 	}
 	svc.Replica = &models.Connection{
 		Cert:     "",
-		Host:     replicaSvc,
+		Host:     replicaSvc + kls.Namespace,
 		Password: password,
 		Port:     int64(port),
 		SslMode:  "",

diff --git a/modules/operator/service-operator/util/kuberlogic/service.go b/modules/operator/service-operator/util/kuberlogic/service.go
@@ -46,15 +46,14 @@ func GetClusterPodLabels(cm *kuberlogicv1.KuberLogicService) (master map[string]
 }
 
 // GetClusterServices returns master and replica service names.
-// A service form is "<svc>.<namespace>".
 // An error is returned if a cluster Operator is not found
 func GetClusterServices(cm *kuberlogicv1.KuberLogicService) (master string, replica string, err error) {
 	op, err := GetCluster(cm)
 	if err != nil {
 		return
 	}
-	master = op.GetInternalDetails().GetMasterService() + "." + cm.Namespace
-	replica = op.GetInternalDetails().GetReplicaService() + "." + cm.Namespace
+	master = op.GetInternalDetails().GetMasterService()
+	replica = op.GetInternalDetails().GetReplicaService()
 	return
 }
 

diff --git a/modules/operator/service-operator/util/kuberlogic/service_test.go b/modules/operator/service-operator/util/kuberlogic/service_test.go
@@ -93,7 +93,7 @@ func TestGetClusterPodLabels(t *testing.T) {
 }
 
 func TestGetClusterServices(t *testing.T) {
-	pgMasterSvcE, pgReplicaSvcE := "kuberlogic-test-pg.default", "kuberlogic-test-pg-repl.default"
+	pgMasterSvcE, pgReplicaSvcE := "kuberlogic-test-pg", "kuberlogic-test-pg-repl"
 	pgMasterSvcA, pgReplicaSvcA, _ := GetClusterServices(cmPg)
 
 	if pgMasterSvcE != pgMasterSvcA || pgReplicaSvcE != pgReplicaSvcA {
@@ -103,7 +103,7 @@ func TestGetClusterServices(t *testing.T) {
 			pgReplicaSvcE, pgReplicaSvcE)
 	}
 
-	mysqlMasterSvcE, mysqlReplicaSvcE := "test-mysql-mysql-master.default", "test-mysql-mysql-replicas.default"
+	mysqlMasterSvcE, mysqlReplicaSvcE := "test-mysql-mysql-master", "test-mysql-mysql-replicas"
 	mysqlMasterSvcA, mysqlReplicaSvcA, _ := GetClusterServices(cmMy)
 
 	if mysqlMasterSvcE != mysqlMasterSvcA || mysqlReplicaSvcE != mysqlReplicaSvcA {