evaluate priority class name

Author: MichaelClifford

src/codeflare_sdk/cluster/cluster.py

@@ -61,6 +61,39 @@ def __init__(self, config: ClusterConfiguration):
         self.app_wrapper_yaml = self.create_app_wrapper()
         self.app_wrapper_name = self.app_wrapper_yaml.split(".")[0]
 
+    def evaluate_config(self):
+        if not self.evaluate_dispatch_priority():
+            return False
+        else:
+            return True
+
+    def evaluate_dispatch_priority(self):
+        priority_class = self.config.dispatch_priority
+        if priority_class is None:
+            return True
+        else:
+            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",
+                )
+                available_priority_classes = [
+                    i["metadata"]["name"] for i in priority_classes["items"]
+                ]
+            except Exception as e:  # pragma: no cover
+                return _kube_api_error_handling(e)
+
+            if priority_class in available_priority_classes:
+                return True
+            else:
+                print(
+                    f"Priority class {priority_class} is not available in the cluster"
+                )
+                return False
+
     def create_app_wrapper(self):
         """
         Called upon cluster object creation, creates an AppWrapper yaml based on
@@ -117,6 +150,12 @@ def up(self):
         Applies the AppWrapper yaml, pushing the resource request onto
         the MCAD queue.
         """
+
+        # Before attempting to bring up the cluster let's evaluate the ClusterConfig
+        if not self.evaluate_config():
+            print("Invalid Cluster Configuration")
+            return False
+
         namespace = self.config.namespace
         try:
             config_check()

src/codeflare_sdk/cluster/config.py

@@ -48,4 +48,4 @@ class ClusterConfiguration:
     image: str = "quay.io/project-codeflare/ray:2.5.0-py38-cu116"
     local_interactive: bool = False
     image_pull_secrets: list = field(default_factory=list)
-    dispatch_priority: str = "default"
+    dispatch_priority: str = None

src/codeflare_sdk/templates/base-template.yaml

@@ -114,7 +114,6 @@ spec:
                           operator: In
                           values:
                           - "aw-kuberay"
-                priorityClassName: "default-priority"
                 containers:
                 # The Ray head pod
                 - env:
@@ -224,7 +223,6 @@ spec:
                           operator: In
                           values:
                           - "aw-kuberay"
-                priorityClassName: "default-priority"
                 initContainers:
                 # the env var $RAY_IP is set by the operator if missing, with the value of the head service name
                 - name: init-myservice

src/codeflare_sdk/utils/generate_yaml.py

@@ -88,26 +88,12 @@ def update_labels(yaml, instascale, instance_types):
         metadata.pop("labels")
 
 
-PRIORITY_LEVELS = {
-    "low": (1, "low-priority"),
-    "default": (5, "default-priority"),
-    "high": (10, "high-priority"),
-}
-
-
-def update_priority(yaml, item, priority):
-    if priority not in PRIORITY_LEVELS:
-        sys.exit("Priority must be 'low', 'default', or 'high'")
-
-    priority_level = PRIORITY_LEVELS[priority]
-    spec = yaml.get("spec")
-    spec["priority"] = priority_level[0]
-    # spec["SchedulingSpec"]["priorityClassName"] = priority_level
-    if "generictemplate" in item.keys():
+def update_priority(item, dispatch_priority):
+    if dispatch_priority is not None:
         head = item.get("generictemplate").get("spec").get("headGroupSpec")
         worker = item.get("generictemplate").get("spec").get("workerGroupSpecs")[0]
-        head["template"]["spec"]["priorityClassName"] = priority_level[1]
-        worker["template"]["spec"]["priorityClassName"] = priority_level[1]
+        head["template"]["spec"]["priorityClassName"] = dispatch_priority
+        worker["template"]["spec"]["priorityClassName"] = dispatch_priority
 
 
 def update_custompodresources(
@@ -346,7 +332,7 @@ def generate_appwrapper(
     route_item = resources["resources"].get("GenericItems")[1]
     update_names(user_yaml, item, appwrapper_name, cluster_name, namespace)
     update_labels(user_yaml, instascale, instance_types)
-    update_priority(user_yaml, item, dispatch_priority)
+    update_priority(item, dispatch_priority)
     update_scheduling_spec(user_yaml, workers)
     update_custompodresources(
         item, min_cpu, max_cpu, min_memory, max_memory, gpu, workers