fix(RHOAIENG-20531): adjusted unit tests

Signed-off-by: Pat O'Connor <[email protected]>

Author: chipspeak

Diff for: demo-notebooks/guided-demos/0_basic_ray.ipynb

@@ -189,7 +189,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "codeflare-sdk-e3w2-nkw-py3.11",
    "language": "python",
    "name": "python3"
   },
@@ -203,12 +203,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "f9f85f796d01129d0dd105a088854619f454435301f6ffec2fea96ecbd9be4ac"
-   }
+   "version": "3.11.11"
   }
  },
  "nbformat": 4,

Diff for: poetry.lock

@@ -59,4 +59,4 @@ markers = [
 ]
 addopts = "--timeout=900"
 testpaths = ["src/codeflare_sdk"]
-collect_ignore = ["src/codeflare_sdk/common/utils/unit_test_support.py"]
+collect_ignore = ["src/codeflare_sdk/common/utils/unit_test_support.py"]

Diff for: pyproject.toml

@@ -98,6 +98,11 @@ def test_aw_creation_local_queue(mocker):
 
     with open(f"{aw_dir}unit-test-aw-kueue.yaml", "r") as f:
         aw_kueue = yaml.load(f, Loader=yaml.FullLoader)
+        print("generated yaml")
+        print(yaml.dump(aw_kueue, default_flow_style=False))
+        print("expected yaml")
+        print(yaml.dump(expected_rc, default_flow_style=False)
+              )
         assert aw_kueue == expected_rc
 
     # With resources loaded in memory, no Local Queue specified.

Diff for: src/codeflare_sdk/common/kueue/test_kueue.py

@@ -40,6 +40,7 @@ def create_cluster_config(num_workers=2, write_to_file=False):
         worker_memory_limits=6,
         appwrapper=True,
         write_to_file=write_to_file,
+        annotations={"app.kubernetes.io/managed-by": "test-prefix", "key1": "value1", "key2": "value2"},
     )
     return config
 
@@ -498,7 +499,7 @@ def create_cluster_all_config_params(mocker, cluster_name, is_appwrapper) -> Clu
         extended_resource_mapping={"example.com/gpu": "GPU", "intel.com/gpu": "TPU"},
         overwrite_default_resource_mapping=True,
         local_queue="local-queue-default",
-        annotations={"key1": "value1", "key2": "value2"},
+        annotations={"app.kubernetes.io/managed-by": "test-prefix", "key1": "value1", "key2": "value2"},
         volumes=volumes,
         volume_mounts=volume_mounts,
     )

Diff for: src/codeflare_sdk/common/utils/unit_test_support.py

@@ -35,7 +35,7 @@ def test_default_cluster_creation(mocker):
     mocker.patch("kubernetes.client.ApisApi.get_api_versions")
     mocker.patch("kubernetes.client.CustomObjectsApi.list_namespaced_custom_object")
 
-    cluster = Cluster(ClusterConfiguration(name="default-cluster", namespace="ns"))
+    cluster = Cluster(ClusterConfiguration(name="default-cluster", namespace="ns", annotations={"app.kubernetes.io/managed-by": "test-prefix", "key1": "value1", "key2": "value2"}))
 
     expected_rc = apply_template(
         f"{expected_clusters_dir}/ray/default-ray-cluster.yaml",
@@ -50,7 +50,7 @@ def test_default_appwrapper_creation(mocker):
     mocker.patch("kubernetes.client.CustomObjectsApi.list_namespaced_custom_object")
 
     cluster = Cluster(
-        ClusterConfiguration(name="default-appwrapper", namespace="ns", appwrapper=True)
+        ClusterConfiguration(name="default-appwrapper", namespace="ns", appwrapper=True, annotations={"app.kubernetes.io/managed-by": "test-prefix", "key1": "value1", "key2": "value2"})
     )
 
     expected_aw = apply_template(

Diff for: src/codeflare_sdk/ray/cluster/test_config.py

@@ -42,6 +42,11 @@ spec:
             resources: '"{\"TPU\": 2}"'
           serviceType: ClusterIP
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - env:
@@ -142,6 +147,11 @@ spec:
             resources: '"{}"'
           replicas: 10
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - env:

Diff for: tests/test_cluster_yamls/appwrapper/unit-test-all-params.yaml

@@ -11,6 +11,10 @@ spec:
       apiVersion: ray.io/v1
       kind: RayCluster
       metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
         labels:
           controller-tools.k8s.io: '1.0'
         name: unit-test-aw-kueue
@@ -36,6 +40,11 @@ spec:
             resources: '"{}"'
           serviceType: ClusterIP
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"
@@ -101,6 +110,11 @@ spec:
             resources: '"{}"'
           replicas: 2
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"

Diff for: tests/test_cluster_yamls/kueue/aw_kueue.yaml

@@ -11,6 +11,10 @@ spec:
       apiVersion: ray.io/v1
       kind: RayCluster
       metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
         labels:
           controller-tools.k8s.io: '1.0'
         name: unit-test-cluster-kueue
@@ -36,6 +40,11 @@ spec:
             resources: '"{}"'
           serviceType: ClusterIP
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"
@@ -101,6 +110,11 @@ spec:
             resources: '"{}"'
           replicas: 2
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"

Diff for: tests/test_cluster_yamls/kueue/ray_cluster_kueue.yaml

@@ -9,6 +9,10 @@ spec:
       apiVersion: ray.io/v1
       kind: RayCluster
       metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
         labels:
           controller-tools.k8s.io: '1.0'
         name: default-appwrapper
@@ -34,6 +38,11 @@ spec:
             resources: '"{}"'
           serviceType: ClusterIP
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"
@@ -99,6 +108,11 @@ spec:
             resources: '"{}"'
           replicas: 1
           template:
+            metadata:
+              annotations:
+                app.kubernetes.io/managed-by: test-prefix
+                key1: value1
+                key2: value2
             spec:
               containers:
               - image: "${image}"

Diff for: tests/test_cluster_yamls/ray/default-appwrapper.yaml

@@ -1,6 +1,10 @@
 apiVersion: ray.io/v1
 kind: RayCluster
 metadata:
+  annotations:
+    app.kubernetes.io/managed-by: test-prefix
+    key1: value1
+    key2: value2
   labels:
     controller-tools.k8s.io: '1.0'
   name: default-cluster
@@ -26,6 +30,11 @@ spec:
       resources: '"{}"'
     serviceType: ClusterIP
     template:
+      metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
       spec:
         containers:
         - image: "${image}"
@@ -91,6 +100,11 @@ spec:
       resources: '"{}"'
     replicas: 1
     template:
+      metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
       spec:
         containers:
         - image: "${image}"

Diff for: tests/test_cluster_yamls/ray/default-ray-cluster.yaml

@@ -33,6 +33,11 @@ spec:
       resources: '"{\"TPU\": 2}"'
     serviceType: ClusterIP
     template:
+      metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
       spec:
         containers:
         - env:
@@ -133,6 +138,11 @@ spec:
       resources: '"{}"'
     replicas: 10
     template:
+      metadata:
+        annotations:
+          app.kubernetes.io/managed-by: test-prefix
+          key1: value1
+          key2: value2
       spec:
         containers:
         - env: