Fix tests broken by updated CRDs

Author: kirkbrauer

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/get_test.py

@@ -15,6 +15,7 @@
     V1Alpha1ExporterStatus,
     V1Alpha1Lease,
     V1Alpha1LeaseList,
+    V1Alpha1LeaseSelector,
     V1Alpha1LeaseSpec,
     V1Alpha1LeaseStatus,
 )
@@ -827,7 +828,7 @@ async def test_get_exporters_devices(_load_kube_config_mock, list_exporters_mock
     spec=V1Alpha1LeaseSpec(
         client=V1ObjectReference(name="test_client"),
         duration="5m",
-        selector={"hardware": "rpi4"},
+        selector=V1Alpha1LeaseSelector(match_labels={"hardware": "rpi4"}),
     ),
 )
 
@@ -858,7 +859,7 @@ async def test_get_exporters_devices(_load_kube_config_mock, list_exporters_mock
     spec=V1Alpha1LeaseSpec(
         client=V1ObjectReference(name="test_client"),
         duration="1h",
-        selector={},
+        selector=V1Alpha1LeaseSelector(match_labels={}),
     ),
 )
 
@@ -875,7 +876,9 @@ async def test_get_exporters_devices(_load_kube_config_mock, list_exporters_mock
             "name": "test_client"
         },
         "duration": "1h",
-        "selector": {}
+        "selector": {
+            "matchLabels": {}
+        }
     },
     "status": {
         "beginTime": "2024-01-01T21:00:00Z",
@@ -908,7 +911,8 @@ async def test_get_exporters_devices(_load_kube_config_mock, list_exporters_mock
   client:
     name: test_client
   duration: 1h
-  selector: {}
+  selector:
+    matchLabels: {}
 status:
   beginTime: '2024-01-01T21:00:00Z'
   conditions:
@@ -1012,7 +1016,9 @@ async def test_get_lease(_load_kube_config_mock, get_lease_mock: AsyncMock):
                 },
                 "duration": "5m",
                 "selector": {
-                    "hardware": "rpi4"
+                    "matchLabels": {
+                        "hardware": "rpi4"
+                    }
                 }
             },
             "status": {
@@ -1047,7 +1053,9 @@ async def test_get_lease(_load_kube_config_mock, get_lease_mock: AsyncMock):
                     "name": "test_client"
                 },
                 "duration": "1h",
-                "selector": {}
+                "selector": {
+                    "matchLabels": {}
+                }
             },
             "status": {
                 "beginTime": "2024-01-01T21:00:00Z",
@@ -1086,7 +1094,8 @@ async def test_get_lease(_load_kube_config_mock, get_lease_mock: AsyncMock):
       name: test_client
     duration: 5m
     selector:
-      hardware: rpi4
+      matchLabels:
+        hardware: rpi4
   status:
     beginTime: '2024-01-01T21:00:00Z'
     conditions:
@@ -1110,7 +1119,8 @@ async def test_get_lease(_load_kube_config_mock, get_lease_mock: AsyncMock):
     client:
       name: test_client
     duration: 1h
-    selector: {}
+    selector:
+      matchLabels: {}
   status:
     beginTime: '2024-01-01T21:00:00Z'
     conditions:

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/__init__.py

@@ -7,7 +7,14 @@
     V1Alpha1ExporterStatus,
 )
 from .install import get_ip_address, helm_installed, install_helm_chart
-from .leases import LeasesV1Alpha1Api, V1Alpha1Lease, V1Alpha1LeaseList, V1Alpha1LeaseSpec, V1Alpha1LeaseStatus
+from .leases import (
+    LeasesV1Alpha1Api,
+    V1Alpha1Lease,
+    V1Alpha1LeaseList,
+    V1Alpha1LeaseSelector,
+    V1Alpha1LeaseSpec,
+    V1Alpha1LeaseStatus,
+)
 from .list import V1Alpha1List
 
 __all__ = [
@@ -24,6 +31,7 @@
     "V1Alpha1Lease",
     "V1Alpha1LeaseStatus",
     "V1Alpha1LeaseList",
+    "V1Alpha1LeaseSelector",
     "V1Alpha1LeaseSpec",
     "V1Alpha1List",
     "get_ip_address",

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/test_leases.py

@@ -1,6 +1,6 @@
 from kubernetes_asyncio.client.models import V1Condition, V1ObjectMeta, V1ObjectReference
 
-from jumpstarter_kubernetes import V1Alpha1Lease, V1Alpha1LeaseSpec, V1Alpha1LeaseStatus
+from jumpstarter_kubernetes import V1Alpha1Lease, V1Alpha1LeaseSelector, V1Alpha1LeaseSpec, V1Alpha1LeaseStatus
 
 TEST_LEASE = V1Alpha1Lease(
     api_version="jumpstarter.dev/v1alpha1",
@@ -16,7 +16,7 @@
     spec=V1Alpha1LeaseSpec(
         client=V1ObjectReference(name="test-client"),
         duration="1h",
-        selector={"test": "label", "another": "something"},
+        selector=V1Alpha1LeaseSelector(match_labels={"test": "label", "another": "something"}),
     ),
     status=V1Alpha1LeaseStatus(
         begin_time="2021-10-01T00:00:00Z",