qontract-reconcile 0.10.1rc32__py3-none-any.whl → 0.10.1rc33__py3-none-any.whl

{qontract_reconcile-0.10.1rc32.dist-info → qontract_reconcile-0.10.1rc33.dist-info}/METADATA

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

@@ -84,7 +84,7 @@ reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0W
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=etfBGj7GDXTOhNHKc40ee5QM0Chq3oHE40HrbWgopc8,971
 reconcile/openshift_serviceaccount_tokens.py,sha256=UlBRjfAxzf9-h4uxQwHqrYnBWMUGFqqfp6KvW2lM76k,6369
 reconcile/openshift_tekton_resources.py,sha256=2BiTYkJqMqqrOdI6jxhLvTJQNWCeWpgxaz1v2LzU-Eo,13558
-reconcile/openshift_upgrade_watcher.py,sha256=B4WevVcOzzcE6I3HMUjFX4m9NUikrHRijGWDm-om7WE,4833
+reconcile/openshift_upgrade_watcher.py,sha256=CEixqF9vNMo0Igfgt3x5d5fzm2vH5ZhoiWaODG4__XU,4886
 reconcile/openshift_users.py,sha256=dKWS3AVmgMKcblafHYz1pLVnTOp1ZzfePGQCaTpVc_8,5213
 reconcile/openshift_vault_secrets.py,sha256=Hy6pVWLsbEjxvn4S1k1zacbM447i5uDdyeT263-bNOI,1562
 reconcile/prometheus_rules_tester_old.py,sha256=YftjUxePvxrcZLRbOhenVTIqbDoyNyMFJodMbb5orrA,14385
@@ -120,10 +120,10 @@ reconcile/vault_replication.py,sha256=xobxnsOfUcwvdQ-RZ7JH_sZCDh8rpEY7MJ36nkvfFq
 reconcile/vpc_peerings_validator.py,sha256=10igLYTQpBMGXO9mTO7sJBzgr4jXQ2hf1OH5r5DKugE,3586
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=O2LDgMbFYKsNuflh8b80sIr59WpJwFHSCeZtacMA6Kg,810
-reconcile/aus/base.py,sha256=6tZLndQNhKUplSvjc9n3BIXVFjvOIwZX_6VCWTHY4MI,27632
+reconcile/aus/base.py,sha256=BTtDuwp4XuBkQv_4nbQbDP3ApvtaXiF9EORpF4CjNhs,25396
 reconcile/aus/models.py,sha256=iPdJCd0bJc1FInZWyGWr6hPCabcowLld2__efzUGFtA,3495
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=vjZM7lNGR2b2phKhimdOw6E1MccRGyXe87oMgn_R4dA,6029
-reconcile/aus/ocm_upgrade_scheduler.py,sha256=wkItEEuU16t5vP5-OvwZwah0tDCmABbLgV4rWRnYYXU,3401
+reconcile/aus/ocm_upgrade_scheduler.py,sha256=4K5FgjI9xV4KziSSs1MIXUrq1tNWhkihOMaIwMr5gqM,3361
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=Ye0eNWNWWn2UecbofO275xMrZpSiqD0JUFlERGU_05w,1484
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=L7XJWJ-rgn8BOmeMb6lBDV8lHFCUaNoHGDSD7OH03vA,2244
@@ -318,7 +318,7 @@ reconcile/test/test_ocm_clusters.py,sha256=R5evfzLWCzHQKywDV5XOXcx9P6lpAXNAmFkkG
 reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=SkHsWj8FZjOkigUky3IgiEswLqMzHJyRg7qPeALp8p0,3330
 reconcile/test/test_ocm_oidc_idp.py,sha256=np2QUFzI8rR1LBy-eKtHtUpkvyM3lLkqKgc9SAlHzXQ,10351
 reconcile/test/test_ocm_update_recommended_version.py,sha256=ONY3slwUHwEdonvIYRI2Z8nWPDMTSSLGZ2I1dqaz7fg,4328
-reconcile/test/test_ocm_upgrade_scheduler.py,sha256=kyIg5MlDgod_ut-SUvf001O3gocVr6XMY3j0cxetJl8,29073
+reconcile/test/test_ocm_upgrade_scheduler.py,sha256=gAHSBVOt1ul3mpXUrLu9QePnOe4za_VjByYDexolGbQ,28181
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=zYRGUX7pAmxSv9oFYw2ZnPGa-YAPgDfmqXOJM4eE-8A,4353
 reconcile/test/test_openshift_base.py,sha256=8GF4Z1dutnjySMqFN03DHTx03y3UDsW724zgZ7djibE,19345
 reconcile/test/test_openshift_namespace_labels.py,sha256=P1hqi6P88NijNrurdXG_QR2usyo3EYZSy9zpwYHvDsM,12104
@@ -536,7 +536,7 @@ reconcile/utils/ocm/base.py,sha256=8pCZB_V6pZhc-qZQFTuIr1kM5nxrzz9kT86-DW3rgq0,1
 reconcile/utils/ocm/cluster_groups.py,sha256=TBb3mIzw68BHBcCzacmAN8IsNPo8FfOnTMphuctwuU0,2679
 reconcile/utils/ocm/clusters.py,sha256=FkkiTSG6Ec0eDWvf0tFF2RVmAG4bZY4sX4WwNF9tKDU,7174
 reconcile/utils/ocm/labels.py,sha256=UqpbJ0HGPHVcooDeKcihnU70NihKz4_BAb480XUk5_U,2986
-reconcile/utils/ocm/ocm.py,sha256=hjwFZ_HzhYeNVTc3ewTrRR4Uxr-nvlpqWbN3kglxqek,66331
+reconcile/utils/ocm/ocm.py,sha256=pp-T6cT0RQf91oqrWFm5QSd_LyH8n5gJmPaetDtMioI,64455
 reconcile/utils/ocm/search_filters.py,sha256=zExZpYBh7_tucG-xKoPHUxz1b_6l9qwbEMpMihQg7nA,15043
 reconcile/utils/ocm/service_log.py,sha256=g6eQTfjdBg3aMOK2JalQ4zNJocgNJdI62XcyVfL3cBQ,2592
 reconcile/utils/ocm/subscriptions.py,sha256=kuHster01yLy0_s5DWFLXh9zse3NIpbGTuKW78q_b90,2322
@@ -574,8 +574,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc32.dist-info/METADATA,sha256=T1H3ivhtOaK-yHLP6dXLUEcNEyXUfaR0YO6ofBUAkY8,2288
-qontract_reconcile-0.10.1rc32.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc32.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc32.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc32.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc33.dist-info/METADATA,sha256=IAKI89TDY__fE_Hh9m-1DYk41-WyYP3u083eOnU5160,2288
+qontract_reconcile-0.10.1rc33.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc33.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc33.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc33.dist-info/RECORD,,

reconcile/aus/base.py

@@ -169,40 +169,27 @@ class AddonUpgradePolicy(AbstractUpgradePolicy):
 class ClusterUpgradePolicy(AbstractUpgradePolicy):
     """Class to create and delete ClusterUpgradePolicies in OCM"""
 
-    def create(self, ocm: OCM) -> None:
-        policy = {
-            "version": self.version,
-            "schedule_type": "manual",
-            "next_run": self.next_run,
-        }
-        ocm.create_control_plane_upgrade_policy(self.cluster, policy)
-
-    def delete(self, ocm: OCM) -> None:
-        item = {
-            "id": self.id,
-        }
-        ocm.delete_control_plane_upgrade_policy(self.cluster, item)
-
+    gates_to_agree: Optional[list[GateAgreement]]
 
-class ControlPlaneUpgradePolicy(AbstractUpgradePolicy):
-    """Class to create and delete ControlPlanUpgradePolicies in OCM"""
+    def _create_gate_agreements(self, ocm: OCM) -> None:
+        for gate in self.gates_to_agree or []:
+            gate.create(ocm, self.cluster)
 
     def create(self, ocm: OCM) -> None:
+        self._create_gate_agreements(ocm)
         policy = {
             "version": self.version,
             "schedule_type": "manual",
-            "upgrade_type": "ControlPlane",
-            "cluster_id": ocm.cluster_ids[self.cluster],
             "next_run": self.next_run,
         }
-        ocm.create_control_plane_upgrade_policy(self.cluster, policy)
+        ocm.create_upgrade_policy(self.cluster, policy)
 
     def delete(self, ocm: OCM) -> None:
         item = {
             "version": self.version,
             "id": self.id,
         }
-        ocm.delete_control_plane_upgrade_policy(self.cluster, item)
+        ocm.delete_upgrade_policy(self.cluster, item)
 
 
 class UpgradePolicyHandler(BaseModel):
@@ -211,12 +198,6 @@ class UpgradePolicyHandler(BaseModel):
     action: str
     policy: AbstractUpgradePolicy
 
-    gates_to_agree: Optional[list[GateAgreement]]
-
-    def _create_gate_agreements(self, ocm: OCM) -> None:
-        for gate in self.gates_to_agree or []:
-            gate.create(ocm, self.policy.cluster)
-
     def act(self, dry_run: bool, ocm: OCM) -> None:
         action_log(
             self.action,
@@ -233,7 +214,6 @@ class UpgradePolicyHandler(BaseModel):
         elif self.action == "delete":
             self.policy.delete(ocm)
         elif self.action == "create":
-            self._create_gate_agreements(ocm)
             self.policy.create(ocm)
 
 
@@ -243,21 +223,12 @@ def fetch_current_state(
     current_state: list[AbstractUpgradePolicy] = []
     for cluster in clusters:
         cluster_name = cluster.name
-        cluster_spec = ocm_map.get(cluster_name).clusters.get(cluster_name)
-        if cluster_spec:
-            # None is fine, we only care if hypershift is true
-            is_hypershift = cluster_spec.spec.hypershift
         ocm = ocm_map.get(cluster_name)
         if addons:
             upgrade_policies = ocm.get_addon_upgrade_policies(cluster_name)
             for upgrade_policy in upgrade_policies:
                 upgrade_policy["cluster"] = cluster_name
                 current_state.append(AddonUpgradePolicy(**upgrade_policy))
-        elif is_hypershift:
-            upgrade_policies = ocm.get_control_plan_upgrade_policies(cluster_name)
-            for upgrade_policy in upgrade_policies:
-                upgrade_policy["cluster"] = cluster_name
-                current_state.append(ControlPlaneUpgradePolicy(**upgrade_policy))
         else:
             upgrade_policies = ocm.get_upgrade_policies(cluster_name)
             for upgrade_policy in upgrade_policies:
@@ -694,10 +665,6 @@ def calculate_diff(
         if verify_lock_should_skip(p, locked, ocm, p.cluster):
             continue
 
-        cluster = ocm.clusters.get(p.cluster)
-        if not cluster:
-            continue
-
         upgrades = get_upgrades(addon_id, p, ocm)
         version = upgradeable_version(p, version_data_map, ocm, upgrades, addon_id)
         if version:
@@ -717,30 +684,6 @@ def calculate_diff(
                         ),
                     )
                 )
-            elif cluster.spec.hypershift:
-                diffs.append(
-                    UpgradePolicyHandler(
-                        action="create",
-                        policy=ControlPlaneUpgradePolicy(
-                            **{
-                                "action": "create",
-                                "cluster": p.cluster,
-                                "version": version,
-                                "schedule_type": "manual",
-                                "next_run": next_schedule,
-                            }
-                        ),
-                        gates_to_agree=[
-                            GateAgreement(id=g)
-                            for g in gates_to_agree(
-                                get_version_prefix(version),
-                                p.cluster,
-                                p.current_version,
-                                ocm,
-                            )
-                        ],
-                    )
-                )
             else:
                 diffs.append(
                     UpgradePolicyHandler(
@@ -752,17 +695,17 @@ def calculate_diff(
                                 "version": version,
                                 "schedule_type": "manual",
                                 "next_run": next_schedule,
+                                "gates_to_agree": [
+                                    GateAgreement(id=g)
+                                    for g in gates_to_agree(
+                                        get_version_prefix(version),
+                                        p.cluster,
+                                        p.current_version,
+                                        ocm,
+                                    )
+                                ],
                             }
                         ),
-                        gates_to_agree=[
-                            GateAgreement(id=g)
-                            for g in gates_to_agree(
-                                get_version_prefix(version),
-                                p.cluster,
-                                p.current_version,
-                                ocm,
-                            )
-                        ],
                     )
                 )
 

reconcile/aus/ocm_upgrade_scheduler.py

@@ -15,12 +15,11 @@ from reconcile.utils import gql
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import (
     OCM_PRODUCT_OSD,
-    OCM_PRODUCT_ROSA,
     OCMMap,
 )
 
 QONTRACT_INTEGRATION = "ocm-upgrade-scheduler"
-SUPPORTED_OCM_PRODUCTS = [OCM_PRODUCT_OSD, OCM_PRODUCT_ROSA]
+SUPPORTED_OCM_PRODUCTS = [OCM_PRODUCT_OSD]
 
 
 class OCMClusterUpgradeSchedulerIntegration(

reconcile/openshift_upgrade_watcher.py

@@ -127,7 +127,9 @@ def run(
     if defer:
         defer(state.cleanup)
 
-    clusters = [c for c in get_clusters() if c.ocm]
+    clusters = [
+        c for c in get_clusters() if c.ocm and not (c.spec and c.spec.hypershift)
+    ]
 
     slack: Optional[SlackApi] = None
     if not dry_run:

reconcile/test/test_ocm_upgrade_scheduler.py

@@ -6,7 +6,6 @@ from typing import Any
 from unittest import TestCase
 from unittest.mock import (
     Mock,
-    NonCallableMagicMock,
     patch,
 )
 
@@ -220,10 +219,10 @@ class TestUpgradeLock:
                 "cluster": "cluster1",
                 "version": "4.3.6",
                 "schedule_type": "manual",
+                "gates_to_agree": [],
                 "next_run": "2021-08-30T19:00:00Z",
             }
         ),
-        gates_to_agree=[],
     )
 
     @patch.object(aus, "datetime", Mock(wraps=datetime))
@@ -672,10 +671,6 @@ class TestCalculateDiff:
         ocm.get_available_upgrades.return_value = ["4.9.5", "4.10.1"]
         ocm.addons = [{"id": "addon1", "version": {"id": "4.9.5"}}]
         ocm.version_blocked.return_value = False
-        cluster = mocker.patch("reconcile.ocm.types.OCMSpec")
-        cluster.spec.hypershift = False
-        ocm = map.get.return_value
-        ocm.clusters.get.return_value = cluster
         return map
 
     @staticmethod
@@ -750,28 +745,7 @@ class TestCalculateDiff:
         assert cup.version == "4.9.5"
         assert cup.schedule_type == "manual"
         assert isinstance(cup, aus.ClusterUpgradePolicy)
-        assert x[0].gates_to_agree == []
-
-    def test_calculate_control_plane(
-        self,
-        cluster_upgrade_policy: ConfiguredClusterUpgradePolicy,
-        ocm_map: NonCallableMagicMock,
-    ):
-        ocm_map.get.return_value.clusters.get.return_value.spec.hypershift = True
-
-        x = aus.calculate_diff(
-            [], [cluster_upgrade_policy], ocm_map, self.create_version_data_map()
-        )
-
-        assert len(x) == 1
-        cup = x[0].policy
-
-        assert x[0].action == "create"
-        assert cup.cluster == "cluster1"
-        assert cup.version == "4.9.5"
-        assert cup.schedule_type == "manual"
-        assert isinstance(cup, aus.ControlPlaneUpgradePolicy)
-        assert x[0].gates_to_agree == []
+        assert cup.gates_to_agree == []
 
     def test_calculate_not_soaked(
         self, cluster_upgrade_policy: ConfiguredClusterUpgradePolicy, ocm_map: OCMMap

reconcile/utils/ocm/ocm.py

@@ -1174,33 +1174,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/versions/{version_id}"
         return self._get_json(api).get("available_upgrades", [])
 
-    def get_control_plan_upgrade_policies(
-        self, cluster, schedule_type=None
-    ) -> list[dict[str, Any]]:
-        """Returns a list of details of Upgrade Policies
-
-        :param cluster: cluster name
-
-        :type cluster: string
-        """
-        results: list[dict[str, Any]] = []
-        cluster_id = self.cluster_ids.get(cluster)
-        if not cluster_id:
-            return results
-
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/control_plane/upgrade_policies"
-        items = self._get_json(api).get("items")
-        if not items:
-            return results
-
-        for item in items:
-            if schedule_type and item["schedule_type"] != schedule_type:
-                continue
-            result = {k: v for k, v in item.items() if k in UPGRADE_POLICY_DESIRED_KEYS}
-            results.append(result)
-
-        return results
-
     def get_upgrade_policies(self, cluster, schedule_type=None) -> list[dict[str, Any]]:
         """Returns a list of details of Upgrade Policies
 
@@ -1225,19 +1198,6 @@ class OCM:  # pylint: disable=too-many-public-methods
 
         return results
 
-    def create_control_plane_upgrade_policy(self, cluster, spec):
-        """Creates a new Upgrade Policy for the control plane
-
-        :param cluster: cluster name
-        :param spec: required information for creation
-
-        :type cluster: string
-        :type spec: dictionary
-        """
-        cluster_id = self.cluster_ids[cluster]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/control_plane/upgrade_policies"
-        self._post(api, spec)
-
     def create_upgrade_policy(self, cluster, spec):
         """Creates a new Upgrade Policy
 
@@ -1251,23 +1211,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/upgrade_policies"
         self._post(api, spec)
 
-    def delete_control_plane_upgrade_policy(self, cluster, spec):
-        """Deletes an existing Control Plane Upgrade Policy
-
-        :param cluster: cluster name
-        :param spec: required information for update
-
-        :type cluster: string
-        :type spec: dictionary
-        """
-        cluster_id = self.cluster_ids[cluster]
-        upgrade_policy_id = spec["id"]
-        api = (
-            f"{CS_API_BASE}/v1/clusters/{cluster_id}/"
-            + f"control_plane/upgrade_policies/{upgrade_policy_id}"
-        )
-        self._delete(api)
-
     def delete_upgrade_policy(self, cluster, spec):
         """Deletes an existing Upgrade Policy