qontract-reconcile 0.10.1rc625__py3-none-any.whl → 0.10.1rc626__py3-none-any.whl

{qontract_reconcile-0.10.1rc625.dist-info → qontract_reconcile-0.10.1rc626.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc625
+Version: 0.10.1rc626
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc625.dist-info → qontract_reconcile-0.10.1rc626.dist-info}/RECORD

@@ -120,10 +120,10 @@ reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPtt
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=PkVcXBMrveW5euvqjEBO4e5-9KDb_6hszLI2GrWpx2w,21378
 reconcile/aus/aus_label_source.py,sha256=qoP8Fgxuu1tCuhG6ixCWve7Ll-KD6a79E2uLAmC0ifw,4184
-reconcile/aus/base.py,sha256=ESycSlsxNGjpy1v2G2NXB7WB6NMYrXCaN4kSVMicRKk,44462
+reconcile/aus/base.py,sha256=N55Ci1XkV-VWnnc2hh0T2aDD95ZUJHM1ZCpWxF0CP6Q,44350
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/metrics.py,sha256=fIew-rzi_kYuI5Gxn3-4bQVIr2oNibiKPyGnhB-xKU4,3538
-reconcile/aus/models.py,sha256=muBmbovxYtSNLFrTLVRcJYZ4dx6JLh8n3Q1-DjWJOHM,7098
+reconcile/aus/models.py,sha256=XaRLgNj26E9eanFh-QbsyiKIa4rQSE80EdhC2I2e81o,7286
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=fshslI27hrqT40qrVsVOQaWxD-jkmzcVZryXzX7plhY,8960
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=7cK2SakCFkl5EdnqUEAYdUo4pUnnf-SsUR10uytAGyE,3058
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=OBgE5mnVdQQV4tMH0AE2V_PDt9Gy6d-LyuPceqjORts,2331
@@ -714,8 +714,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc625.dist-info/METADATA,sha256=zHAp9JWVyX5qDHsnC7BAbcN2EjAMiPlwm2AwJIi2KLI,2382
-qontract_reconcile-0.10.1rc625.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc625.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc625.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc625.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc626.dist-info/METADATA,sha256=YEElB5dh2AcXSFH2tnKjN1Dk9c7E-9mxD3CzYjXqVLY,2382
+qontract_reconcile-0.10.1rc626.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc626.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc626.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc626.dist-info/RECORD,,

reconcile/aus/base.py

@@ -844,7 +844,7 @@ def verify_schedule_should_skip(
 def verify_lock_should_skip(
     desired: ClusterUpgradeSpec, locked: dict[str, str]
 ) -> bool:
-    mutexes = desired.upgrade_policy.conditions.mutexes or []
+    mutexes = desired.effective_mutexes
     if any(lock in locked for lock in mutexes):
         locking = {lock: locked[lock] for lock in mutexes if lock in locked}
         logging.debug(
@@ -919,9 +919,9 @@ def calculate_diff(
     """
 
     def set_mutex(
-        locked: dict[str, str], cluster_id: str, mutexes: Optional[list[str]] = None
+        locked: dict[str, str], cluster_id: str, mutexes: Optional[set[str]] = None
     ) -> None:
-        for mutex in mutexes or []:
+        for mutex in mutexes or set():
             locked[mutex] = cluster_id
 
     diffs: list[UpgradePolicyHandler] = []
@@ -930,7 +930,7 @@ def calculate_diff(
     locked: dict[str, str] = {}
     for spec in desired_state.specs:
         if spec.cluster.id in [s.cluster.id for s in current_state]:
-            for mutex in spec.upgrade_policy.conditions.mutexes or []:
+            for mutex in spec.effective_mutexes:
                 locked[mutex] = spec.cluster.id
 
     now = datetime.utcnow()
@@ -945,9 +945,7 @@ def calculate_diff(
             node_pool_update = _calculate_node_pool_diffs(ocm_api, spec, now)
             if node_pool_update:  # node pool update policy not yet created
                 diffs.append(node_pool_update)
-                set_mutex(
-                    locked, spec.cluster.id, spec.upgrade_policy.conditions.mutexes
-                )
+                set_mutex(locked, spec.cluster.id, spec.effective_mutexes)
                 continue
 
         # ignore clusters with an existing upgrade policy
@@ -1024,7 +1022,7 @@ def calculate_diff(
                         policy=_create_upgrade_policy(next_schedule, spec, version),
                     )
                 )
-            set_mutex(locked, spec.cluster.id, spec.upgrade_policy.conditions.mutexes)
+            set_mutex(locked, spec.cluster.id, spec.effective_mutexes)
 
     return diffs
 

reconcile/aus/models.py

@@ -55,6 +55,12 @@ class ClusterUpgradeSpec(BaseModel):
     def get_available_upgrades(self) -> list[str]:
         return self.cluster.available_upgrades()
 
+    @property
+    def effective_mutexes(self) -> set[str]:
+        mutexes = set(self.upgrade_policy.conditions.mutexes or [])
+        mutexes.add(self.cluster.id)
+        return mutexes
+
 
 class ClusterAddonUpgradeSpec(ClusterUpgradeSpec):
     addon: OCMAddonInstallation