bugfix: label selectors for raycluster and MPI

kubernetes-sigs · Aug 9, 2024 · dcd5bc8 · dcd5bc8
1 parent 888a14f
commit dcd5bc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/controller/jobs/mpijob/mpijob_controller.go b/pkg/controller/jobs/mpijob/mpijob_controller.go
@@ -105,7 +105,7 @@ func (j *MPIJob) GVK() schema.GroupVersionKind {
 }
 
 func (j *MPIJob) PodLabelSelector() string {
-	return fmt.Sprintf("%s=%s", kubeflow.JobNameLabel, j.Labels[kubeflow.JobNameLabel])
+	return fmt.Sprintf("%s=%s", kubeflow.JobNameLabel, j.Name)
 }
 
 func (j *MPIJob) PodSets() []kueue.PodSet {

diff --git a/pkg/controller/jobs/rayjob/rayjob_controller.go b/pkg/controller/jobs/rayjob/rayjob_controller.go
@@ -21,9 +21,8 @@ import (
 	"fmt"
 	"strings"
 
-	batchv1 "k8s.io/api/batch/v1"
-
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
+	rayutils "github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -93,7 +92,7 @@ func (j *RayJob) GVK() schema.GroupVersionKind {
 
 func (j *RayJob) PodLabelSelector() string {
 	if j.Status.RayClusterName != "" {
-		return fmt.Sprintf("%s=%s", batchv1.JobNameLabel, j.Name)
+		return fmt.Sprintf("%s=%s", rayutils.RayClusterLabelKey, j.Status.RayClusterName)
 	}
 	return ""
 }