cleanup from botched whitespace merge in rebase

Author: dgrove-oss

src/codeflare_sdk/cluster/cluster.py

@@ -478,11 +478,6 @@ def from_k8_cluster_object(
                 "containers"
             ]:
                 openshift_oauth = "oauth-proxy" in container["name"]
-        machine_types = (
-            rc["metadata"]["labels"]["orderedinstance"].split("_")
-            if "orderedinstance" in rc["metadata"]["labels"]
-            else []
-        )
 
         if local_interactive and ingress_domain == None:
             ingress_domain = rc["metadata"]["annotations"][

src/codeflare_sdk/templates/base-template.yaml

@@ -8,7 +8,7 @@ spec:
   - podSets:
     - replicas: 1
       path: template.spec.headGroupSpec.template
-      - replicas: 3
+    - replicas: 3
       path: template.spec.workerGroupSpecs[0].template
     template:
         # This config demonstrates KubeRay's Ray autoscaler integration.

src/codeflare_sdk/utils/generate_yaml.py

@@ -361,10 +361,10 @@ def enable_local_interactive(components, cluster_name, namespace, ingress_domain
         namespace,
         ingress_domain,
     )
-    item["generictemplate"]["metadata"]["annotations"][
+    item["template"]["metadata"]["annotations"][
         "sdk.codeflare.dev/local_interactive"
     ] = "True"
-    item["generictemplate"]["metadata"]["annotations"][
+    item["template"]["metadata"]["annotations"][
         "sdk.codeflare.dev/ingress_domain"
     ] = ingress_domain
 
@@ -373,9 +373,9 @@ def enable_local_interactive(components, cluster_name, namespace, ingress_domain
     ].get("command")[2] = command
 
 
-def apply_ingress_domain_annotation(resources, ingress_domain):
-    item = resources["resources"].get("GenericItems")[0]
-    item["generictemplate"]["metadata"]["annotations"][
+def apply_ingress_domain_annotation(components, ingress_domain):
+    item = components[0]
+    item["template"]["metadata"]["annotations"][
         "sdk.codeflare.dev/ingress_domain"
     ] = ingress_domain
 
@@ -629,7 +629,7 @@ def generate_appwrapper(
         ingress_domain,
     )
     if ingress_domain is not None:
-        apply_ingress_domain_annotation(resources, ingress_domain)
+        apply_ingress_domain_annotation(components, ingress_domain)
 
     if local_interactive:
         enable_local_interactive(components, cluster_name, namespace, ingress_domain)