fix-scheduling-spec

Author: MichaelClifford

src/codeflare_sdk/templates/base-template.yaml

@@ -8,8 +8,6 @@ metadata:
     orderedinstance: "m4.xlarge_g4dn.xlarge"
 spec:
   priority: 9
-  schedulingSpec:
-    minAvailable: 3
   resources:
     Items: []
     GenericItems:

src/codeflare_sdk/utils/generate_yaml.py

@@ -89,13 +89,18 @@ def update_labels(yaml, instascale, instance_types):
         metadata.pop("labels")
 
 
-def update_priority(item, dispatch_priority):
+def update_priority(yaml, item, workers, 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"] = dispatch_priority
         worker["template"]["spec"]["priorityClassName"] = dispatch_priority
+        update_scheduling_spec(yaml,workers)
 
+def update_scheduling_spec(yaml, workers):
+    spec = yaml.get("spec")
+    spec["schedulingSpec"]={"minAvailable":""}
+    spec["schedulingSpec"]["minAvailable"] = workers + 1
 
 def update_custompodresources(
     item, min_cpu, max_cpu, min_memory, max_memory, gpu, workers
@@ -183,11 +188,6 @@ def update_resources(spec, min_cpu, max_cpu, min_memory, max_memory, gpu):
             limits["nvidia.com/gpu"] = gpu
 
 
-def update_scheduling_spec(yaml, workers):
-    spec = yaml.get("spec")
-    spec["schedulingSpec"]["minAvailable"] = workers + 1
-
-
 def update_nodes(
     item,
     appwrapper_name,
@@ -368,8 +368,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(item, dispatch_priority)
-    update_scheduling_spec(user_yaml, workers)
+    update_priority(user_yaml, item, workers, dispatch_priority)
     update_custompodresources(
         item, min_cpu, max_cpu, min_memory, max_memory, gpu, workers
     )