prune mocked appwrappers

Author: dgrove-oss

src/codeflare_sdk/templates/base-template.yaml

@@ -5,29 +5,8 @@ metadata:
   namespace: default
 spec:
   resources:
-    Items: []
     GenericItems:
     - replicas: 1
-      #new addition
-      custompodresources:
-      - replicas: 1
-        requests:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-        limits:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-      - replicas: 3
-        requests:
-          cpu: 2
-          memory: 12G
-          nvidia.com/gpu: 1
-        limits:
-          cpu: 2
-          memory: 12G
-          nvidia.com/gpu: 1
       generictemplate:
         # This config demonstrates KubeRay's Ray autoscaler integration.
         # The resource requests and limits in this config are too small for production!

src/codeflare_sdk/utils/generate_yaml.py

@@ -87,56 +87,6 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
     lower_meta["namespace"] = namespace
 
 
-def update_custompodresources(
-    item,
-    min_cpu,
-    max_cpu,
-    min_memory,
-    max_memory,
-    gpu,
-    workers,
-    head_cpus,
-    head_memory,
-    head_gpus,
-):
-    if "custompodresources" in item.keys():
-        custompodresources = item.get("custompodresources")
-        for i in range(len(custompodresources)):
-            resource = custompodresources[i]
-            if i == 0:
-                # Leave head node resources as template default
-                resource["requests"]["cpu"] = head_cpus
-                resource["limits"]["cpu"] = head_cpus
-                resource["requests"]["memory"] = head_memory
-                resource["limits"]["memory"] = head_memory
-                resource["requests"]["nvidia.com/gpu"] = head_gpus
-                resource["limits"]["nvidia.com/gpu"] = head_gpus
-
-            else:
-                for k, v in resource.items():
-                    if k == "replicas" and i == 1:
-                        resource[k] = workers
-                    if k == "requests" or k == "limits":
-                        for spec, _ in v.items():
-                            if spec == "cpu":
-                                if k == "limits":
-                                    resource[k][spec] = max_cpu
-                                else:
-                                    resource[k][spec] = min_cpu
-                            if spec == "memory":
-                                if k == "limits":
-                                    resource[k][spec] = max_memory
-                                else:
-                                    resource[k][spec] = min_memory
-                            if spec == "nvidia.com/gpu":
-                                if i == 0:
-                                    resource[k][spec] = 0
-                                else:
-                                    resource[k][spec] = gpu
-    else:
-        sys.exit("Error: malformed template")
-
-
 def update_image(spec, image):
     containers = spec.get("containers")
     for container in containers:
@@ -368,18 +318,6 @@ def generate_appwrapper(
         cluster_name,
         namespace,
     )
-    update_custompodresources(
-        item,
-        min_cpu,
-        max_cpu,
-        min_memory,
-        max_memory,
-        gpu,
-        workers,
-        head_cpus,
-        head_memory,
-        head_gpus,
-    )
     update_nodes(
         item,
         appwrapper_name,

tests/test-case-bad.yaml

@@ -8,26 +8,7 @@ metadata:
 spec:
   resources:
     GenericItems:
-    - custompodresources:
-      - limits:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-        replicas: 1
-        requests:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-      - limits:
-          cpu: 4
-          memory: 6G
-          nvidia.com/gpu: 7
-        replicas: 2
-        requests:
-          cpu: 3
-          memory: 5G
-          nvidia.com/gpu: 7
-      generictemplate:
+    - generictemplate:
         apiVersion: ray.io/v1
         kind: RayCluster
         metadata:

tests/test-case.yaml

@@ -6,26 +6,7 @@ metadata:
 spec:
   resources:
     GenericItems:
-    - custompodresources:
-      - limits:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-        replicas: 1
-        requests:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-      - limits:
-          cpu: 4
-          memory: 6G
-          nvidia.com/gpu: 7
-        replicas: 2
-        requests:
-          cpu: 3
-          memory: 5G
-          nvidia.com/gpu: 7
-      generictemplate:
+    - generictemplate:
         apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
@@ -179,4 +160,3 @@ spec:
                     optional: true
                   name: odh-ca-cert
       replicas: 1
-    Items: []

tests/test-default-appwrapper.yaml

@@ -6,26 +6,7 @@ metadata:
 spec:
   resources:
     GenericItems:
-    - custompodresources:
-      - limits:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-        replicas: 1
-        requests:
-          cpu: 2
-          memory: 8G
-          nvidia.com/gpu: 0
-      - limits:
-          cpu: 1
-          memory: 2G
-          nvidia.com/gpu: 0
-        replicas: 1
-        requests:
-          cpu: 1
-          memory: 2G
-          nvidia.com/gpu: 0
-      generictemplate:
+    - generictemplate:
         apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
@@ -177,4 +158,3 @@ spec:
                     optional: true
                   name: odh-ca-cert
       replicas: 1
-    Items: []