memgraph operator fixes for service discovery config

Author: irfn

api/v1alpha1/memgraphcluster_types.go

@@ -78,6 +78,28 @@ type MemgraphClusterSpec struct {
 	// Affinity for pod scheduling
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+
+	// ServiceNames allows customizing the generated service names
+	// +optional
+	ServiceNames *ServiceNamesSpec `json:"serviceNames,omitempty"`
+}
+
+// ServiceNamesSpec allows customizing the suffixes for generated services
+type ServiceNamesSpec struct {
+	// HeadlessSuffix is the suffix for the headless service (default: "-hl")
+	// +kubebuilder:default="-hl"
+	// +optional
+	HeadlessSuffix string `json:"headlessSuffix,omitempty"`
+
+	// WriteSuffix is the suffix for the write service (default: "-write")
+	// +kubebuilder:default="-write"
+	// +optional
+	WriteSuffix string `json:"writeSuffix,omitempty"`
+
+	// ReadSuffix is the suffix for the read service (default: "-read")
+	// +kubebuilder:default="-read"
+	// +optional
+	ReadSuffix string `json:"readSuffix,omitempty"`
 }
 
 // StorageSpec defines the persistent storage configuration

api/v1alpha1/zz_generated.deepcopy.go

@@ -1102,6 +1102,26 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                     type: object
                 type: object
+              serviceNames:
+                description: ServiceNames allows customizing the generated service
+                  names
+                properties:
+                  headlessSuffix:
+                    default: -hl
+                    description: 'HeadlessSuffix is the suffix for the headless service
+                      (default: "-hl")'
+                    type: string
+                  readSuffix:
+                    default: -read
+                    description: 'ReadSuffix is the suffix for the read service (default:
+                      "-read")'
+                    type: string
+                  writeSuffix:
+                    default: -write
+                    description: 'WriteSuffix is the suffix for the write service
+                      (default: "-write")'
+                    type: string
+                type: object
               snapshot:
                 description: Snapshot defines snapshot and backup configuration
                 properties:

config/crd/bases/memgraph.base14.io_memgraphclusters.yaml

@@ -77,7 +77,7 @@ func (rm *ReplicationManager) ConfigureReplication(ctx context.Context, cluster
 		}
 
 		replicaName := rm.getReplicaName(pod.Name)
-		replicaHost := rm.getPodFQDN(pod.Name, cluster.Name, cluster.Namespace)
+		replicaHost := getPodFQDN(pod.Name, cluster)
 
 		// Ensure replica role
 		if err := rm.ensureReplicaRole(ctx, cluster.Namespace, pod.Name); err != nil {
@@ -266,8 +266,9 @@ func (rm *ReplicationManager) getReplicaName(podName string) string {
 }
 
 // getPodFQDN returns the fully qualified domain name for a pod
-func (rm *ReplicationManager) getPodFQDN(podName, clusterName, namespace string) string {
+// Uses the headless service name from the cluster spec
+func getPodFQDN(podName string, cluster *memgraphv1alpha1.MemgraphCluster) string {
 	// Format: pod-name.headless-service.namespace.svc.cluster.local
-	headlessService := clusterName + "-headless"
-	return fmt.Sprintf("%s.%s.%s.svc.cluster.local", podName, headlessService, namespace)
+	headlessService := headlessServiceName(cluster)
+	return fmt.Sprintf("%s.%s.%s.svc.cluster.local", podName, headlessService, cluster.Namespace)
 }

internal/controller/replication.go

@@ -34,35 +34,42 @@ func TestReplicationManager_getReplicaName(t *testing.T) {
 	}
 }
 
-func TestReplicationManager_getPodFQDN(t *testing.T) {
-	rm := &ReplicationManager{}
-
+func TestGetPodFQDN(t *testing.T) {
 	tests := []struct {
-		podName     string
-		clusterName string
-		namespace   string
-		expected    string
+		name     string
+		podName  string
+		cluster  *memgraphv1alpha1.MemgraphCluster
+		expected string
 	}{
 		{
-			"my-cluster-0",
-			"my-cluster",
-			"default",
-			"my-cluster-0.my-cluster-headless.default.svc.cluster.local",
+			name:    "default suffix",
+			podName: "my-cluster-0",
+			cluster: &memgraphv1alpha1.MemgraphCluster{
+				ObjectMeta: metav1.ObjectMeta{Name: "my-cluster", Namespace: "default"},
+			},
+			expected: "my-cluster-0.my-cluster-hl.default.svc.cluster.local",
 		},
 		{
-			"prod-db-1",
-			"prod-db",
-			"production",
-			"prod-db-1.prod-db-headless.production.svc.cluster.local",
+			name:    "custom suffix",
+			podName: "prod-db-1",
+			cluster: &memgraphv1alpha1.MemgraphCluster{
+				ObjectMeta: metav1.ObjectMeta{Name: "prod-db", Namespace: "production"},
+				Spec: memgraphv1alpha1.MemgraphClusterSpec{
+					ServiceNames: &memgraphv1alpha1.ServiceNamesSpec{
+						HeadlessSuffix: "-headless",
+					},
+				},
+			},
+			expected: "prod-db-1.prod-db-headless.production.svc.cluster.local",
 		},
 	}
 
 	for _, tt := range tests {
-		t.Run(tt.podName, func(t *testing.T) {
-			result := rm.getPodFQDN(tt.podName, tt.clusterName, tt.namespace)
+		t.Run(tt.name, func(t *testing.T) {
+			result := getPodFQDN(tt.podName, tt.cluster)
 			if result != tt.expected {
-				t.Errorf("getPodFQDN(%s, %s, %s) = %s, want %s",
-					tt.podName, tt.clusterName, tt.namespace, result, tt.expected)
+				t.Errorf("getPodFQDN(%s, cluster) = %s, want %s",
+					tt.podName, result, tt.expected)
 			}
 		})
 	}

internal/controller/replication_test.go

@@ -10,17 +10,36 @@ import (
 	memgraphv1alpha1 "github.com/base14/memgraph-operator/api/v1alpha1"
 )
 
+// Default service name suffixes
+const (
+	defaultHeadlessSuffix = "-hl"
+	defaultWriteSuffix    = "-write"
+	defaultReadSuffix     = "-read"
+)
+
 // Service name helpers
 func headlessServiceName(cluster *memgraphv1alpha1.MemgraphCluster) string {
-	return cluster.Name + "-hl"
+	suffix := defaultHeadlessSuffix
+	if cluster.Spec.ServiceNames != nil && cluster.Spec.ServiceNames.HeadlessSuffix != "" {
+		suffix = cluster.Spec.ServiceNames.HeadlessSuffix
+	}
+	return cluster.Name + suffix
 }
 
 func writeServiceName(cluster *memgraphv1alpha1.MemgraphCluster) string {
-	return cluster.Name + "-write"
+	suffix := defaultWriteSuffix
+	if cluster.Spec.ServiceNames != nil && cluster.Spec.ServiceNames.WriteSuffix != "" {
+		suffix = cluster.Spec.ServiceNames.WriteSuffix
+	}
+	return cluster.Name + suffix
 }
 
 func readServiceName(cluster *memgraphv1alpha1.MemgraphCluster) string {
-	return cluster.Name + "-read"
+	suffix := defaultReadSuffix
+	if cluster.Spec.ServiceNames != nil && cluster.Spec.ServiceNames.ReadSuffix != "" {
+		suffix = cluster.Spec.ServiceNames.ReadSuffix
+	}
+	return cluster.Name + suffix
 }
 
 // buildHeadlessService creates the headless service for StatefulSet DNS