@@ -461,6 +461,7 @@ def job_logs(self, job_id: str) -> str:
461
461
def from_k8_cluster_object (
462
462
rc ,
463
463
appwrapper = True ,
464
+ kueue = True ,
464
465
write_to_file = False ,
465
466
verify_tls = True ,
466
467
):
@@ -470,6 +471,11 @@ def from_k8_cluster_object(
470
471
if "orderedinstance" in rc ["metadata" ]["labels" ]
471
472
else []
472
473
)
474
+ local_queue = (
475
+ rc ["metadata" ].get ("labels" , dict ()).get ("kueue.x-k8s.io/queue-name" , None )
476
+ if kueue
477
+ else None
478
+ )
473
479
474
480
cluster_config = ClusterConfiguration (
475
481
name = rc ["metadata" ]["name" ],
@@ -499,9 +505,8 @@ def from_k8_cluster_object(
499
505
appwrapper = appwrapper ,
500
506
write_to_file = write_to_file ,
501
507
verify_tls = verify_tls ,
502
- local_queue = rc ["metadata" ]
503
- .get ("labels" , dict ())
504
- .get ("kueue.x-k8s.io/queue-name" , None ),
508
+ kueue = kueue ,
509
+ local_queue = local_queue ,
505
510
)
506
511
return Cluster (cluster_config )
507
512
@@ -634,9 +639,11 @@ def get_cluster(
634
639
for rc in rcs ["items" ]:
635
640
if rc ["metadata" ]["name" ] == cluster_name :
636
641
appwrapper = _check_aw_exists (cluster_name , namespace )
642
+ kueue = _check_kueue_enabled (rc )
637
643
return Cluster .from_k8_cluster_object (
638
644
rc ,
639
645
appwrapper = appwrapper ,
646
+ kueue = kueue ,
640
647
write_to_file = write_to_file ,
641
648
verify_tls = verify_tls ,
642
649
)
@@ -691,6 +698,14 @@ def _check_aw_exists(name: str, namespace: str) -> bool:
691
698
return False
692
699
693
700
701
+ def _check_kueue_enabled (rc ) -> bool :
702
+ # This function will check if a Ray Cluster is being managed by Kueue by checking for the local queue label
703
+ for label in rc ["metadata" ]["labels" ]:
704
+ if label == "kueue.x-k8s.io/queue-name" :
705
+ return True
706
+ return False
707
+
708
+
694
709
# Cant test this until get_current_namespace is fixed and placed in this function over using `self`
695
710
def _get_ingress_domain (self ): # pragma: no cover
696
711
config_check ()
0 commit comments