Fix bug#34624864 - Adding comptibilit to K8s 1.25, dropping <=1.20

Change-Id: I603c3c64d22b10ffa28cad558774cf8450ac7960
mysql · Sep 25, 2022 · 5082bf1 · 5082bf1
1 parent 4930323
commit 5082bf1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/mysqloperator/controller/backup/backup_objects.py b/mysqloperator/controller/backup/backup_objects.py
@@ -164,7 +164,7 @@ def patch_cron_template_for_backup_schedule(base: dict, cluster_name: str, sched
 
 def get_cron_job_template(spec: InnoDBClusterSpec) -> dict:
     tmpl = f"""
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   labels:

diff --git a/mysqloperator/controller/innodbcluster/cluster_api.py b/mysqloperator/controller/innodbcluster/cluster_api.py
@@ -663,9 +663,9 @@ def get_service(self) -> typing.Optional[api_client.V1Service]:
 
     # As of K8s 1.21 this is no more beta.
     # Thus, eventually this needs to be upgraded to V1PodDisruptionBudget and api_policy to PolicyV1Api
-    def get_disruption_budget(self) -> typing.Optional[api_client.V1beta1PodDisruptionBudget]:
+    def get_disruption_budget(self) -> typing.Optional[api_client.V1PodDisruptionBudget]:
         try:
-            return cast(api_client.V1beta1PodDisruptionBudget,
+            return cast(api_client.V1PodDisruptionBudget,
                         api_policy.read_namespaced_pod_disruption_budget(self.name + "-pdb", self.namespace))
         except ApiException as e:
             if e.status == 404:
@@ -700,9 +700,9 @@ def get_router_deployment(self) -> typing.Optional[api_client.V1Deployment]:
             raise
 
     def get_cron_job(self, schedule_name: str) -> typing.Callable:
-        def get_cron_job_inner() -> typing.Optional[api_client.V1beta1CronJob]:
+        def get_cron_job_inner() -> typing.Optional[api_client.V1CronJob]:
             try:
-                return cast(api_client.V1beta1CronJob,
+                return cast(api_client.V1CronJob,
                             api_cron_job.read_namespaced_cron_job(schedule_name, self.namespace))
             except ApiException as e:
                 if e.status == 404:

diff --git a/mysqloperator/controller/innodbcluster/cluster_objects.py b/mysqloperator/controller/innodbcluster/cluster_objects.py
@@ -71,7 +71,7 @@ def encode(s):
 
 def prepare_cluster_pod_disruption_budget(spec: InnoDBClusterSpec) -> dict:
     tmpl = f"""
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {spec.name}-pdb

diff --git a/mysqloperator/controller/kubeutils.py b/mysqloperator/controller/kubeutils.py
@@ -22,8 +22,8 @@
 api_customobj: client.CustomObjectsApi = client.CustomObjectsApi()
 api_apps: client.AppsV1Api = client.AppsV1Api()
 api_batch: client.BatchV1Api = client.BatchV1Api()
-api_cron_job: client.BatchV1beta1Api = client.BatchV1beta1Api()
-api_policy: client.PolicyV1beta1Api = client.PolicyV1beta1Api()
+api_cron_job: client.BatchV1Api = client.BatchV1Api()
+api_policy: client.PolicyV1Api = client.PolicyV1Api()
 api_rbac: client.RbacAuthorizationV1Api = client.RbacAuthorizationV1Api()
 
 T = TypeVar("T")