From 20e6d932ee08cbbd6dd5f193b3ffb9b839db9a96 Mon Sep 17 00:00:00 2001
From: MichaelClifford <mcliffor@redhat.com>
Date: Wed, 21 Jun 2023 16:24:18 -0400
Subject: [PATCH] update base template with priorities and update cluster

---
 src/codeflare_sdk/cluster/cluster.py           | 14 --------------
 src/codeflare_sdk/templates/base-template.yaml |  4 ++++
 tests/test-case.yaml                           |  3 ++-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/codeflare_sdk/cluster/cluster.py b/src/codeflare_sdk/cluster/cluster.py
index 7392a0838..5600ae399 100644
--- a/src/codeflare_sdk/cluster/cluster.py
+++ b/src/codeflare_sdk/cluster/cluster.py
@@ -89,16 +89,9 @@ def create_app_wrapper(self):
         instascale = self.config.instascale
         instance_types = self.config.machine_types
         env = self.config.envs
-<<<<<<< HEAD
-<<<<<<< HEAD
         local_interactive = self.config.local_interactive
         image_pull_secrets = self.config.image_pull_secrets
-=======
-        priority = self.config.priority
->>>>>>> 7e7a311 ( add priorities and schedulingSpec to SDK)
-=======
         dispatch_priority = self.config.dispatch_priority
->>>>>>> b1d1d16 (change 'priority' to 'dispatch priority')
         return generate_appwrapper(
             name=name,
             namespace=namespace,
@@ -113,16 +106,9 @@ def create_app_wrapper(self):
             instascale=instascale,
             instance_types=instance_types,
             env=env,
-<<<<<<< HEAD
-<<<<<<< HEAD
             local_interactive=local_interactive,
             image_pull_secrets=image_pull_secrets,
-=======
-            priority=priority,
->>>>>>> 7e7a311 ( add priorities and schedulingSpec to SDK)
-=======
             dispatch_priority=dispatch_priority,
->>>>>>> b1d1d16 (change 'priority' to 'dispatch priority')
         )
 
     # creates a new cluster with the provided or default spec
diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
index f408df2e2..1f6c2a660 100644
--- a/src/codeflare_sdk/templates/base-template.yaml
+++ b/src/codeflare_sdk/templates/base-template.yaml
@@ -8,6 +8,8 @@ metadata:
     orderedinstance: "m4.xlarge_g4dn.xlarge"
 spec:
   priority: 9
+  schedulingSpec:
+    minAvailable: 3
   resources:
     Items: []
     GenericItems:
@@ -112,6 +114,7 @@ spec:
                           operator: In
                           values:
                           - "aw-kuberay"
+                priorityClassName: "default-priority"
                 containers:
                 # The Ray head pod
                 - env:
@@ -221,6 +224,7 @@ 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
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
index 80ae0eac0..5a9b5ca64 100644
--- a/tests/test-case.yaml
+++ b/tests/test-case.yaml
@@ -109,6 +109,7 @@ spec:
                       nvidia.com/gpu: 0
                 imagePullSecrets:
                 - name: unit-test-pull-secret
+                priorityClassName: default-priority
           rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-unit-test-cluster
@@ -192,7 +193,7 @@ spec:
           to:
             kind: Service
             name: unit-test-cluster-head-svc
-      replicas: 1
+      replica: 1
     Items: []
   schedulingSpec:
     minAvailable: 3