Adding support for extensions v1 v1beta1

paasta_tools/kubernetes_tools.py

@@ -47,6 +47,7 @@
 from kubernetes.client import models
 from kubernetes.client import V1Affinity
 from kubernetes.client import V1AWSElasticBlockStoreVolumeSource
+from kubernetes.client import V1Beta1CustomResourceDefinition
 from kubernetes.client import V1beta1PodDisruptionBudget
 from kubernetes.client import V1beta1PodDisruptionBudgetSpec
 from kubernetes.client import V1Capabilities
@@ -539,6 +540,17 @@ def __init__(
         self.jsonify = self.api_client.sanitize_for_serialization
 
 
+class KubeClientV1Beta1(KubeClient):
+    def __init__(
+        self,
+        component: Optional[str] = None,
+        config_file: Optional[str] = None,
+        context: Optional[str] = None,
+    ) -> None:
+        super().__init__(self, component, config_file, context)
+        self.apiextensions = kube_client.ApiextensionsV1Beta1Api(self.api_client)
+
+
 def allowlist_denylist_to_requirements(
     allowlist: DeployWhitelist, denylist: DeployBlacklist
 ) -> List[Tuple[str, str, List[str]]]:
@@ -3800,7 +3812,9 @@ def mode_to_int(mode: Optional[Union[str, int]]) -> Optional[int]:
 
 def update_crds(
     kube_client: KubeClient,
-    desired_crds: Collection[V1CustomResourceDefinition],
+    desired_crds: Collection[
+        V1CustomResourceDefinition | V1Beta1CustomResourceDefinition
+    ],
     existing_crds: V1CustomResourceDefinitionList,
 ) -> bool:
     success = True

paasta_tools/setup_kubernetes_crd.py

@@ -27,9 +27,11 @@
 from typing import Sequence
 
 import service_configuration_lib
+from kubernetes.client import V1Beta1CustomResourceDefinition
 from kubernetes.client import V1CustomResourceDefinition
 
 from paasta_tools.kubernetes_tools import KubeClient
+from paasta_tools.kubernetes_tools import KubeClientV1Beta1
 from paasta_tools.kubernetes_tools import paasta_prefixed
 from paasta_tools.kubernetes_tools import update_crds
 from paasta_tools.utils import DEFAULT_SOA_DIR
@@ -84,12 +86,18 @@ def main() -> None:
         cluster = system_paasta_config.get_cluster()
 
     kube_client = KubeClient()
+    kube_client_v1_beta1 = KubeClientV1Beta1()
 
     success = setup_kube_crd(
         kube_client=kube_client,
         cluster=cluster,
         services=args.service_list,
         soa_dir=soa_dir,
+    ) or setup_kube_crd(
+        kube_client=kube_client_v1_beta1,
+        cluster=cluster,
+        services=args.service_list,
+        soa_dir=soa_dir,
     )
     sys.exit(0 if success else 1)
 
@@ -118,12 +126,20 @@ def setup_kube_crd(
             metadata["labels"] = {}
         metadata["labels"]["yelp.com/paasta_service"] = service
         metadata["labels"][paasta_prefixed("service")] = service
-        desired_crd = V1CustomResourceDefinition(
-            api_version=crd_config.get("apiVersion"),
-            kind=crd_config.get("kind"),
-            metadata=metadata,
-            spec=crd_config.get("spec"),
-        )
+        if isinstance(kube_client, KubeClientV1Beta1):
+            desired_crd = V1Beta1CustomResourceDefinition(
+                api_version=crd_config.get("apiVersion"),
+                kind=crd_config.get("kind"),
+                metadata=metadata,
+                spec=crd_config.get("spec"),
+            )
+        else:
+            desired_crd = V1CustomResourceDefinition(
+                api_version=crd_config.get("apiVersion"),
+                kind=crd_config.get("kind"),
+                metadata=metadata,
+                spec=crd_config.get("spec"),
+            )
         desired_crds.append(desired_crd)
 
     return update_crds(

requirements.txt

@@ -44,7 +44,7 @@ jmespath==0.9.3
 jsonref==0.1
 jsonschema==2.5.1
 kazoo==2.8.0
-kubernetes==24.2.0
+kubernetes==21.7.0
 ldap3==2.6
 manhole==1.5.0
 marathon==0.12.0