qontract-reconcile 0.10.1rc714__py3-none-any.whl → 0.10.1rc716__py3-none-any.whl

{qontract_reconcile-0.10.1rc714.dist-info → qontract_reconcile-0.10.1rc716.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc714
+Version: 0.10.1rc716
 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.1rc714.dist-info → qontract_reconcile-0.10.1rc716.dist-info}/RECORD

@@ -701,7 +701,7 @@ reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnY
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9pyNFZ1cNZFmDGBUah9vjpP0y9f9w,2810
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
-reconcile/utils/ocm/addons.py,sha256=cofEAtnoBGKbtShSe3oAz9YbEuql1z6w_2FoNiBcFwA,6887
+reconcile/utils/ocm/addons.py,sha256=swWSOPbLprbxhmt8jd4hH5y3xeWF78y8hk9o4rfIXms,6890
 reconcile/utils/ocm/base.py,sha256=GclZtCrPkPJmGP9HHvqIlV-8VXSKuaQTQJkA2pklN60,13817
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Nw9m-jgN3GHHCh6w9UOBbMV4rtS24_-Ep09jAWQ-_fE,7653
@@ -729,7 +729,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=1DKXUmiTS_MejUfSpFCeuBLMTgR4ldv2N1tAz8qHAwc,5547
-reconcile/utils/saasherder/saasherder.py,sha256=yjfOU9CwVSbEIAm99KsmTpeEQBUoucXzcz1odqzNYoo,86734
+reconcile/utils/saasherder/saasherder.py,sha256=4IQL-r2uo1iejv0krdaPXaW9CnqBKF6t9Skjs2m263I,86170
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -764,8 +764,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 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.1rc714.dist-info/METADATA,sha256=CUPtaFqb8JqY-WCO6qonRwfFiq7OMqe5t5NOrfMHAuo,2382
-qontract_reconcile-0.10.1rc714.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc714.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc714.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc714.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc716.dist-info/METADATA,sha256=Gt8-f3KdLFBMIfyutjkC-vGUpOFCnW5V30bKB-auB1Q,2382
+qontract_reconcile-0.10.1rc716.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc716.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc716.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc716.dist-info/RECORD,,

reconcile/utils/ocm/addons.py

@@ -175,7 +175,7 @@ class AddonServiceV2(AddonService):
         results: list[dict[str, Any]] = []
 
         for policy in ocm_api.get_paginated(
-            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan"
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plans"
         ):
             if addon_id and policy["addon_id"] != addon_id:
                 continue
@@ -208,7 +208,7 @@ class AddonServiceV2(AddonService):
             "next_run": next_run,
         }
         ocm_api.post(
-            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan", spec
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plans", spec
         )
 
     def delete_addon_upgrade_policy(
@@ -218,5 +218,5 @@ class AddonServiceV2(AddonService):
         Deletes an existing upgrade plan.
         """
         ocm_api.delete(
-            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan/{policy_id}"
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plans/{policy_id}"
         )

reconcile/utils/saasherder/saasherder.py

@@ -329,8 +329,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     )
                     self._validate_target_in_app(saas_file, target)
 
-                    self._warn_deployment_and_clowder_overlap(saas_file)
-
                     if target.promotion:
                         rt_ref = (
                             saas_file.path,
@@ -628,20 +626,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     f"Please remove promotion_data for channel {prom_data.channel}."
                 )
 
-    @staticmethod
-    def _warn_deployment_and_clowder_overlap(
-        saas_file: SaasFile,
-    ) -> None:
-        if (
-            "Deployment" in saas_file.managed_resource_types
-            and "ClowdApp" in saas_file.managed_resource_types
-        ):
-            logging.warning(
-                f"[{saas_file.name}] "
-                "Deployment and Clowdapp resources are used together. "
-                "This is not recommended as it may cause unexpected behavior."
-            )
-
     @staticmethod
     def _get_upstream_jobs(
         jjb: JJB,