remove util function

Signed-off-by: Ryan O'Leary <[email protected]>

Author: ryanaoleary

ray-operator/controllers/ray/common/pod.go

@@ -329,6 +329,12 @@ func DefaultWorkerPodTemplate(ctx context.Context, instance rayv1.RayCluster, wo
 	mergedLabels := mergeLabels(workerSpec.Template.ObjectMeta.Labels, workerSpec.Labels)
 	podTemplate.Labels = labelPod(rayv1.WorkerNode, instance.Name, workerSpec.GroupName, mergedLabels)
 
+	// Add additional labels for RayMultihostIndexing
+	multihostIndexingEnabled := features.Enabled(features.RayMultiHostIndexing) && workerSpec.NumOfHosts > 1
+	if multihostIndexingEnabled {
+		podTemplate.Labels[utils.RayWorkerReplicaIndexKey] = replicaGrpName
+		podTemplate.Labels[utils.RayHostIndexKey] = strconv.Itoa(numHostIndex)
+	}
 	workerSpec.RayStartParams = setMissingRayStartParams(ctx, workerSpec.RayStartParams, rayv1.WorkerNode, headPort, fqdnRayIP)
 
 	initTemplateAnnotations(instance, &podTemplate)
@@ -642,15 +648,6 @@ func labelPod(rayNodeType rayv1.RayNodeType, rayClusterName string, groupName st
 	return labels
 }
 
-// addMultihostIndexingPodLabels returns labels that contain RayMultihostIndexing feature labels
-func addMultihostIndexingPodLabels(currentLabels map[string]string, replicaGrpName string, numHostIndex int) map[string]string {
-	labels := currentLabels
-	labels[utils.RayWorkerReplicaIndexKey] = replicaGrpName
-	labels[utils.RayHostIndexKey] = strconv.Itoa(numHostIndex)
-
-	return labels
-}
-
 func setInitContainerEnvVars(container *corev1.Container, fqdnRayIP string) {
 	if len(container.Env) == 0 {
 		container.Env = []corev1.EnvVar{}