run hacks in health monitor

vexxhost · May 2, 2024 · 7deaf42 · 7deaf42
1 parent 3432b0c
commit 7deaf42
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/magnum_cluster_api/driver.py b/magnum_cluster_api/driver.py
@@ -32,7 +32,6 @@
 from magnum_cluster_api import (
     clients,
     exceptions,
-    hacks,
     monitor,
     objects,
     resources,
@@ -192,7 +191,6 @@ def update_cluster_status(
                 cluster.status = fields.ClusterStatus.UPDATE_COMPLETE
 
             cluster.save()
-            return
 
         if cluster.status == fields.ClusterStatus.DELETE_IN_PROGRESS:
             if capi_cluster and capi_cluster.exists():
@@ -227,9 +225,6 @@ def update_cluster_status(
             cluster.status_reason = None
             cluster.status = fields.ClusterStatus.DELETE_COMPLETE
             cluster.save()
-            return
-
-        hacks.set_certificate_expiry_days(self.k8s_api)
 
     @cluster_lock_wrapper
     def update_cluster(

diff --git a/magnum_cluster_api/hacks.py b/magnum_cluster_api/hacks.py
@@ -52,11 +52,3 @@ def set_certificate_expiry_days(
                 utils.kube_apply_patch(kcpt)
 
         CERTIFICATE_EXPIRY_DAYS_FIX_APPLIED = True
-
-        kcps = objects.KubeadmControlPlane.objects(
-            api, namespace="magnum-system"
-        ).all()
-        for kcp in kcps:
-            kcp.obj["spec"].setdefault("rolloutBefore", {})
-            kcp.obj["spec"]["rolloutBefore"]["certificatesExpiryDays"] = 21
-            utils.kube_apply_patch(kcp)
diff --git a/magnum_cluster_api/monitor.py b/magnum_cluster_api/monitor.py
@@ -17,7 +17,7 @@
 from oslo_log import log as logging
 from oslo_utils import strutils
 
-from magnum_cluster_api import clients, objects, utils
+from magnum_cluster_api import clients, hacks, objects, utils
 
 LOG = logging.getLogger(__name__)
 
@@ -78,3 +78,5 @@ def poll_health_status(self):
             self.data["health_status"] = fields.ClusterHealthStatus.HEALTHY
 
         self.poll_nodegroup_replicas()
+
+        hacks.set_certificate_expiry_days(self.k8s_api)
diff --git a/magnum_cluster_api/tests/functional/test_hacks.py b/magnum_cluster_api/tests/functional/test_hacks.py
@@ -13,12 +13,7 @@
 # under the License.
 
 import pytest
-from tenacity import (
-    Retrying,
-    retry_if_result,
-    stop_after_delay,
-    wait_fixed,
-)
+from tenacity import Retrying, retry_if_result, stop_after_delay, wait_fixed
 
 from magnum_cluster_api import clients, hacks, objects, resources, utils