remove dispatch_priority (not supported by v1beta2 AppWrapper)

Author: dgrove-oss

src/codeflare_sdk/cluster/cluster.py

@@ -103,26 +103,6 @@ def job_client(self):
             )
         return self._job_submission_client
 
-    def evaluate_dispatch_priority(self):
-        priority_class = self.config.dispatch_priority
-
-        try:
-            config_check()
-            api_instance = client.CustomObjectsApi(api_config_handler())
-            priority_classes = api_instance.list_cluster_custom_object(
-                group="scheduling.k8s.io",
-                version="v1",
-                plural="priorityclasses",
-            )
-        except Exception as e:  # pragma: no cover
-            return _kube_api_error_handling(e)
-
-        for pc in priority_classes["items"]:
-            if pc["metadata"]["name"] == priority_class:
-                return pc["value"]
-        print(f"Priority class {priority_class} is not available in the cluster")
-        return None
-
     def validate_image_config(self):
         """
         Validates that the image configuration is not empty.
@@ -152,18 +132,6 @@ def create_app_wrapper(self):
         self.validate_image_config()
 
         # Before attempting to create the cluster AW, let's evaluate the ClusterConfig
-        if self.config.dispatch_priority:
-            if not self.config.appwrapper:
-                raise ValueError(
-                    "Invalid Cluster Configuration, cannot have dispatch priority without MCAD"
-                )
-            priority_val = self.evaluate_dispatch_priority()
-            if priority_val == None:
-                raise ValueError(
-                    "Invalid Cluster Configuration, AppWrapper not generated"
-                )
-        else:
-            priority_val = None
 
         name = self.config.name
         namespace = self.config.namespace
@@ -183,7 +151,6 @@ def create_app_wrapper(self):
         instance_types = self.config.machine_types
         env = self.config.envs
         image_pull_secrets = self.config.image_pull_secrets
-        dispatch_priority = self.config.dispatch_priority
         write_to_file = self.config.write_to_file
         verify_tls = self.config.verify_tls
         local_queue = self.config.local_queue
@@ -207,8 +174,6 @@ def create_app_wrapper(self):
             instance_types=instance_types,
             env=env,
             image_pull_secrets=image_pull_secrets,
-            dispatch_priority=dispatch_priority,
-            priority_val=priority_val,
             write_to_file=write_to_file,
             verify_tls=verify_tls,
             local_queue=local_queue,

src/codeflare_sdk/cluster/config.py

@@ -51,7 +51,6 @@ class ClusterConfiguration:
     envs: dict = field(default_factory=dict)
     image: str = ""
     image_pull_secrets: list = field(default_factory=list)
-    dispatch_priority: str = None
     write_to_file: bool = False
     verify_tls: bool = True
     labels: dict = field(default_factory=dict)

src/codeflare_sdk/utils/generate_yaml.py

@@ -103,21 +103,9 @@ def update_labels(yaml, instascale, instance_types):
         metadata.pop("labels")
 
 
-def update_priority(yaml, item, dispatch_priority, priority_val):
+def update_priority(yaml, item):
     spec = yaml.get("spec")
-    if dispatch_priority is not None:
-        if priority_val:
-            spec["priority"] = priority_val
-        else:
-            raise ValueError(
-                "AW generation error: Priority value is None, while dispatch_priority is defined"
-            )
-        head = item.get("generictemplate").get("spec").get("headGroupSpec")
-        worker = item.get("generictemplate").get("spec").get("workerGroupSpecs")[0]
-        head["template"]["spec"]["priorityClassName"] = dispatch_priority
-        worker["template"]["spec"]["priorityClassName"] = dispatch_priority
-    else:
-        spec.pop("priority")
+    spec.pop("priority")
 
 
 def update_custompodresources(
@@ -430,8 +418,6 @@ def generate_appwrapper(
     instance_types: list,
     env,
     image_pull_secrets: list,
-    dispatch_priority: str,
-    priority_val: int,
     write_to_file: bool,
     verify_tls: bool,
     local_queue: Optional[str],
@@ -449,7 +435,7 @@ def generate_appwrapper(
         namespace,
     )
     update_labels(user_yaml, instascale, instance_types)
-    update_priority(user_yaml, item, dispatch_priority, priority_val)
+    update_priority(user_yaml, item)
     update_custompodresources(
         item,
         min_cpu,

tests/test-case-prio.yaml

@@ -268,7 +268,6 @@ def test_config_creation():
     assert config.instascale
     assert config.machine_types == ["cpu.small", "gpu.large"]
     assert config.image_pull_secrets == ["unit-test-pull-secret"]
-    assert config.dispatch_priority == None
     assert config.appwrapper == True
 
 
@@ -413,30 +412,6 @@ def test_cluster_creation_no_mcad_local_queue(mocker):
     )
 
 
-def test_cluster_creation_priority(mocker):
-    mocker.patch("kubernetes.client.ApisApi.get_api_versions")
-    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
-    mocker.patch(
-        "kubernetes.client.CustomObjectsApi.list_cluster_custom_object",
-        return_value={"items": [{"metadata": {"name": "default"}, "value": 10}]},
-    )
-    config = createClusterConfig()
-    config.name = "prio-test-cluster"
-    config.dispatch_priority = "default"
-    mocker.patch(
-        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
-        return_value={"spec": {"domain": "apps.cluster.awsroute.org"}},
-    )
-    cluster = Cluster(config)
-    assert cluster.app_wrapper_yaml == f"{aw_dir}prio-test-cluster.yaml"
-    assert cluster.app_wrapper_name == "prio-test-cluster"
-    assert filecmp.cmp(
-        f"{aw_dir}prio-test-cluster.yaml",
-        f"{parent}/tests/test-case-prio.yaml",
-        shallow=True,
-    )
-
-
 def test_default_cluster_creation(mocker):
     mocker.patch("kubernetes.client.ApisApi.get_api_versions")
     mocker.patch(
@@ -3255,7 +3230,6 @@ def test_rjc_list_jobs(ray_job_client, mocker):
 # Make sure to always keep this function last
 def test_cleanup():
     os.remove(f"{aw_dir}unit-test-cluster.yaml")
-    os.remove(f"{aw_dir}prio-test-cluster.yaml")
     os.remove(f"{aw_dir}test.yaml")
     os.remove(f"{aw_dir}raytest2.yaml")
     os.remove(f"{aw_dir}unit-test-cluster-ray.yaml")