fix: fix cross selection issue amongst services in DGD (#6113)

Signed-off-by: mohammedabdulwahhab <furkhan324@berkeley.edu>

deploy/operator/internal/controller/dynamocomponentdeployment_controller.go

@@ -1352,8 +1352,11 @@ func (r *DynamoComponentDeploymentReconciler) generateService(opt generateResour
 	}
 
 	selector := map[string]string{
-		commonconsts.KubeLabelDynamoComponentType: opt.dynamoComponentDeployment.Spec.ComponentType,
-		commonconsts.KubeLabelDynamoNamespace:     *opt.dynamoComponentDeployment.Spec.DynamoNamespace,
+		commonconsts.KubeLabelDynamoComponentType: opt.dynamoComponentDeployment.Spec.ComponentType,    // e.g. "worker"
+		commonconsts.KubeLabelDynamoNamespace:     *opt.dynamoComponentDeployment.Spec.DynamoNamespace, // result of ComputeDynamoNamespace(k8sNamespace, dgdName)
+		// The original user provided component name (the service map key, e.g. "VllmDecodeWorker" in the DGD).
+		// Needed to disambiguate amongst distinct components with the same component type within a DGD (e.g prefill/decode workers).
+		commonconsts.KubeLabelDynamoComponent: opt.dynamoComponentDeployment.Spec.ServiceName,
 	}
 	// // If using LeaderWorkerSet, modify selector to only target leaders
 	if opt.dynamoComponentDeployment.IsMultinode() {
@@ -1364,9 +1367,6 @@ func (r *DynamoComponentDeploymentReconciler) generateService(opt generateResour
 	}
 	if isK8sDiscovery {
 		labels[commonconsts.KubeLabelDynamoDiscoveryBackend] = "kubernetes"
-	}
-	// Discovery is enabled for non frontend components
-	if isK8sDiscovery && !opt.dynamoComponentDeployment.IsFrontendComponent() {
 		labels[commonconsts.KubeLabelDynamoDiscoveryEnabled] = commonconsts.KubeLabelValueTrue
 	}
 

deploy/operator/internal/dynamo/graph.go

@@ -550,7 +550,8 @@ func GenerateComponentService(ctx context.Context, dynamoDeployment *v1alpha1.Dy
 	if component.DynamoNamespace == nil {
 		return nil, fmt.Errorf("expected DynamoComponentDeployment %s to have a dynamoNamespace", componentName)
 	}
-	componentName = GetDynamoComponentName(dynamoDeployment, componentName)
+	// DNS-safe service resource name: "{dgd-name}-{lowercase(componentName)}"
+	kubeServiceName := GetDynamoComponentName(dynamoDeployment, componentName)
 
 	var servicePort corev1.ServicePort
 	switch component.ComponentType {
@@ -593,14 +594,17 @@ func GenerateComponentService(ctx context.Context, dynamoDeployment *v1alpha1.Dy
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      componentName,
+			Name:      kubeServiceName,
 			Namespace: dynamoDeployment.Namespace,
 			Labels:    labels,
 		},
 		Spec: corev1.ServiceSpec{
 			Selector: map[string]string{
-				commonconsts.KubeLabelDynamoComponentType: component.ComponentType,
-				commonconsts.KubeLabelDynamoNamespace:     *component.DynamoNamespace,
+				commonconsts.KubeLabelDynamoComponentType: component.ComponentType,    // e.g "worker"
+				commonconsts.KubeLabelDynamoNamespace:     *component.DynamoNamespace, // result of ComputeDynamoNamespace(k8sNamespace, dgdName)
+				// The original user provided component name (the service map key, e.g. "VllmDecodeWorker" in the DGD).
+				// Needed to disambiguate amongst distinct components with the same component type within a DGD (e.g prefill/decode workers).
+				commonconsts.KubeLabelDynamoComponent: componentName,
 			},
 			Ports: []corev1.ServicePort{servicePort},
 		},