clean up

Author: cchen777

ray-operator/config/samples/ray-service.sample.yaml

@@ -74,7 +74,7 @@ spec:
         spec:
           containers:
             - name: ray-head
-              image: rayproject/ray:2.9.0-aarch64
+              image: rayproject/ray:2.9.0
               resources:
                 limits:
                   cpu: 2
@@ -107,7 +107,7 @@ spec:
           spec:
             containers:
               - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name',  or '123-abc'
-                image: rayproject/ray:2.9.0-aarch64
+                image: rayproject/ray:2.9.0
                 lifecycle:
                   preStop:
                     exec:

ray-operator/controllers/ray/raycluster_controller.go

@@ -1204,9 +1204,11 @@ func (r *RayClusterReconciler) calculateStatus(ctx context.Context, instance *ra
 	}
 
 	// Check if the head node is running and ready by checking the head pod's status.
-	headPod, _ := r.getHeadPod(ctx, newInstance)
-
 	if features.Enabled(features.RayClusterStatusConditions) {
+		headPod, err := common.GetRayClusterHeadPod(ctx, r, newInstance)
+		if err != nil {
+			return nil, err
+		}
 		replicaHeadPodReadyCondition := utils.FindPodReadyCondition(headPod, rayv1.HeadPodReady)
 		meta.SetStatusCondition(&newInstance.Status.Conditions, replicaHeadPodReadyCondition)
 	}
@@ -1485,17 +1487,3 @@ func sumGPUs(resources map[corev1.ResourceName]resource.Quantity) resource.Quant
 
 	return totalGPUs
 }
-
-// TODO this should be replace by other implementation
-func (r *RayClusterReconciler) getHeadPod(ctx context.Context, instance *rayv1.RayCluster) (*corev1.Pod, error) {
-	podList := corev1.PodList{}
-	if err := r.List(ctx, &podList, common.RayClusterHeadPodsAssociationOptions(instance).ToListOptions()...); err != nil {
-		return nil, err
-	}
-
-	if len(podList.Items) != 1 {
-		return nil, fmt.Errorf("Found %d head pods for RayCluster %s in the namespace %s", len(podList.Items), instance.Name, instance.Namespace)
-	}
-
-	return &podList.Items[0], nil
-}