Fix broken jmp admin get leases command with updated CRDs

Author: kirkbrauer

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

@@ -131,12 +131,14 @@ def get_reason(lease: V1Alpha1Lease):
             return "Expired"
         else:
             return "Complete"
+    else:
+        return reason
 
 
 def make_lease_row(lease: V1Alpha1Lease):
     selectors = []
-    for label in lease.spec.selector:
-        selectors.append(f"{label}:{str(lease.spec.selector[label])}")
+    for label in lease.spec.selector.match_labels:
+        selectors.append(f"{label}:{str(lease.spec.selector.match_labels[label])}")
     return {
         "NAME": lease.metadata.name,
         "CLIENT": lease.spec.client.name if lease.spec.client is not None else "",

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/leases.py

@@ -17,10 +17,14 @@ class V1Alpha1LeaseStatus(JsonBaseModel):
     exporter: Optional[SerializeV1ObjectReference]
 
 
+class V1Alpha1LeaseSelector(JsonBaseModel):
+    match_labels: dict[str, str] = Field(alias="matchLabels")
+
+
 class V1Alpha1LeaseSpec(JsonBaseModel):
     client: SerializeV1ObjectReference
     duration: Optional[str]
-    selector: dict[str, str]
+    selector: V1Alpha1LeaseSelector
 
 
 class V1Alpha1Lease(JsonBaseModel):
@@ -38,7 +42,6 @@ def from_dict(dict: dict):
             metadata=V1ObjectMeta(
                 creation_timestamp=dict["metadata"]["creationTimestamp"],
                 generation=dict["metadata"]["generation"],
-                labels=dict["metadata"]["labels"],
                 managed_fields=dict["metadata"]["managedFields"],
                 name=dict["metadata"]["name"],
                 namespace=dict["metadata"]["namespace"],
@@ -69,7 +72,7 @@ def from_dict(dict: dict):
                 if "clientRef" in dict["spec"]
                 else None,
                 duration=dict["spec"]["duration"] if "duration" in dict["spec"] else None,
-                selector=dict["spec"]["selector"],
+                selector=V1Alpha1LeaseSelector(match_labels=dict["spec"]["selector"]["matchLabels"]),
             ),
         )