fix remove by name function to not be in place

Signed-off-by: Kevin <[email protected]>

Author: KPostOffice

src/codeflare_sdk/templates/base-template.yaml

@@ -198,7 +198,7 @@ spec:
                     name: odh-trusted-ca-bundle
                     items:
                     - key: ca-bundle.crt
-                      path: odh-custom-ca-bundle.crt
+                      path: odh-trusted-ca-bundle.crt
                     optional: true
                 - name: odh-ca-cert
                   configMap:
@@ -327,7 +327,7 @@ spec:
                     name: odh-trusted-ca-bundle
                     items:
                     - key: ca-bundle.crt
-                      path: odh-custom-ca-bundle.crt
+                      path: odh-trusted-ca-bundle.crt
                     optional: true
                 - name: odh-ca-cert
                   configMap:

src/codeflare_sdk/utils/generate_yaml.py

@@ -467,34 +467,38 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
     ][0].get("command")[2] = command
 
 
-def del_from_list_by_name(l: list, target: typing.List[str]):
-    for item in l:
-        if item["name"] in ["ca-vol", "server-cert"]:
-            l.remove(item)
+def del_from_list_by_name(l: list, target: typing.List[str]) -> list:
+    return [x for x in l if x["name"] not in target]
 
 
 def disable_raycluster_tls(resources):
     generic_template_spec = resources["GenericItems"][0]["generictemplate"]["spec"]
 
-    del_from_list_by_name(
-        generic_template_spec["headGroupSpec"]["template"]["spec"].get("volumes", []),
+    headGroupTemplateSpec = generic_template_spec["headGroupSpec"]["template"]["spec"]
+    headGroupTemplateSpec["volumes"] = del_from_list_by_name(
+        headGroupTemplateSpec.get("volumes", []),
         ["ca-vol", "server-cert"],
     )
 
     c: dict
     for c in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"]:
-        del_from_list_by_name(c.get("volumeMounts", []), ["ca-vol", "server-cert"])
+        c["volumeMounts"] = del_from_list_by_name(
+            c.get("volumeMounts", []), ["ca-vol", "server-cert"]
+        )
 
     if "initContainers" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
         del generic_template_spec["headGroupSpec"]["template"]["spec"]["initContainers"]
 
-    for workerGroup in generic_template_spec.get("workerGroupSpecs"):
-        del_from_list_by_name(
-            workerGroup["template"]["spec"].get("volumes", []),
+    for workerGroup in generic_template_spec.get("workerGroupSpecs", []):
+        workerGroupSpec = workerGroup["template"]["spec"]
+        workerGroupSpec["volumes"] = del_from_list_by_name(
+            workerGroupSpec.get("volumes", []),
             ["ca-vol", "server-cert"],
         )
         for c in workerGroup["template"]["spec"].get("containers", []):
-            del_from_list_by_name(c.get("volumeMounts", []), ["ca-vol", "server-cert"])
+            c["volumeMounts"] = del_from_list_by_name(
+                c.get("volumeMounts", []), ["ca-vol", "server-cert"]
+            )
 
     del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
         "initContainers"

tests/test-case-no-mcad.yamls

@@ -78,9 +78,6 @@ spec:
               memory: 8G
               nvidia.com/gpu: 0
           volumeMounts:
-          - mountPath: /home/ray/workspace/tls
-            name: server-cert
-            readOnly: true
           - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
             name: odh-trusted-ca-cert
             subPath: odh-trusted-ca-bundle.crt
@@ -96,8 +93,6 @@ spec:
         imagePullSecrets:
         - name: unit-test-pull-secret
         volumes:
-        - emptyDir: {}
-          name: server-cert
         - configMap:
             items:
             - key: ca-bundle.crt
@@ -170,9 +165,6 @@ spec:
               memory: 5G
               nvidia.com/gpu: 7
           volumeMounts:
-          - mountPath: /home/ray/workspace/tls
-            name: server-cert
-            readOnly: true
           - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
             name: odh-trusted-ca-cert
             subPath: odh-trusted-ca-bundle.crt
@@ -188,8 +180,6 @@ spec:
         imagePullSecrets:
         - name: unit-test-pull-secret
         volumes:
-        - emptyDir: {}
-          name: server-cert
         - configMap:
             items:
             - key: ca-bundle.crt

tests/test-case-prio.yaml

@@ -108,9 +108,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 0
                   volumeMounts:
-                  - mountPath: /home/ray/workspace/tls
-                    name: server-cert
-                    readOnly: true
                   - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
                     name: odh-trusted-ca-cert
                     subPath: odh-trusted-ca-bundle.crt
@@ -127,8 +124,6 @@ spec:
                 - name: unit-test-pull-secret
                 priorityClassName: default
                 volumes:
-                - emptyDir: {}
-                  name: server-cert
                 - configMap:
                     items:
                     - key: ca-bundle.crt
@@ -201,9 +196,6 @@ spec:
                       memory: 5G
                       nvidia.com/gpu: 7
                   volumeMounts:
-                  - mountPath: /home/ray/workspace/tls
-                    name: server-cert
-                    readOnly: true
                   - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
                     name: odh-trusted-ca-cert
                     subPath: odh-trusted-ca-bundle.crt
@@ -220,8 +212,6 @@ spec:
                 - name: unit-test-pull-secret
                 priorityClassName: default
                 volumes:
-                - emptyDir: {}
-                  name: server-cert
                 - configMap:
                     items:
                     - key: ca-bundle.crt

tests/test-case.yaml

@@ -107,9 +107,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 0
                   volumeMounts:
-                  - mountPath: /home/ray/workspace/tls
-                    name: server-cert
-                    readOnly: true
                   - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
                     name: odh-trusted-ca-cert
                     subPath: odh-trusted-ca-bundle.crt
@@ -125,8 +122,6 @@ spec:
                 imagePullSecrets:
                 - name: unit-test-pull-secret
                 volumes:
-                - emptyDir: {}
-                  name: server-cert
                 - configMap:
                     items:
                     - key: ca-bundle.crt
@@ -199,9 +194,6 @@ spec:
                       memory: 5G
                       nvidia.com/gpu: 7
                   volumeMounts:
-                  - mountPath: /home/ray/workspace/tls
-                    name: server-cert
-                    readOnly: true
                   - mountPath: /etc/pki/tls/certs/odh-trusted-ca-bundle.crt
                     name: odh-trusted-ca-cert
                     subPath: odh-trusted-ca-bundle.crt
@@ -217,8 +209,6 @@ spec:
                 imagePullSecrets:
                 - name: unit-test-pull-secret
                 volumes:
-                - emptyDir: {}
-                  name: server-cert
                 - configMap:
                     items:
                     - key: ca-bundle.crt

tests/unit_test.py

@@ -2756,9 +2756,6 @@ def test_enable_local_interactive(mocker):
         head_group_spec["template"]["spec"]["initContainers"][0]["volumeMounts"]
         == volume_mounts
     )
-    print(head_group_spec["template"]["spec"]["volumes"])
-    print("----------------")
-    print(volumes)
     assert head_group_spec["template"]["spec"]["volumes"] == volumes
 
     # 2. workerGroupSpec has the initContainers command to generated TLS cert from the mounted CA cert.