qontract-reconcile 0.10.2.dev70__py3-none-any.whl → 0.10.2.dev71__py3-none-any.whl

{qontract_reconcile-0.10.2.dev70.dist-info → qontract_reconcile-0.10.2.dev71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev70
+Version: 0.10.2.dev71
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev70.dist-info → qontract_reconcile-0.10.2.dev71.dist-info}/RECORD

@@ -127,7 +127,7 @@ reconcile/aus/base.py,sha256=2h_8GuwEHJBLmiwTwaFT9EjiCHcmIEXF8Zo7rZ974kQ,48832
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
-reconcile/aus/models.py,sha256=MSKX7SY0GDw7BgpIuKeLT3i_v8E1LFz4M0DQAL7JWUM,7783
+reconcile/aus/models.py,sha256=R72G-2_mx4KHvdIFOzOd2neubu-BBlw5i7hqKVk7W3s,8149
 reconcile/aus/node_pool_spec.py,sha256=FkMggklG-4BgQwud2Swp2m3AAAKzZmeaXgohl9uwxZ8,1138
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=-xliq44ev35P6YzwrGLppReRUWrKDTNptNjaivwICIc,10263
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=2uPn13y3QGCHLoKwCc1Z7q9wQsoQf_F1HATMYUbl53s,3695
@@ -709,7 +709,7 @@ reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLs
 reconcile/utils/ocm/label_sources.py,sha256=ES_5VP4X6gsRxMFZ95WgbwE_HqqIUo_JRjHjdGYw6Ss,1846
 reconcile/utils/ocm/labels.py,sha256=CmAgaOEPiaUb4gLtKab9vNkSDJceuREPd4ApgGcIA1U,6240
 reconcile/utils/ocm/manifests.py,sha256=Q6kgOeiAwLbJY_vO_BEW2oePvbLDZcMZk20YpJJGpOA,1195
-reconcile/utils/ocm/ocm.py,sha256=EwhCymt7r8cL8UF2XbwmQ6IiRE016AUuPEiMAtYMepE,36707
+reconcile/utils/ocm/ocm.py,sha256=qDD7x4uhnr7WJenc5mN9XSttu4NhI8FDEUIc33nWKpM,33211
 reconcile/utils/ocm/products.py,sha256=Ki9o0VV4z_FsXQaJtSFzlUnxLvpk1H-RamvJpUwwbuQ,26006
 reconcile/utils/ocm/search_filters.py,sha256=uUCJ-XOEp4D5uxPW7lDqNe6s-mQWLOCqMu9_xvO6PXU,14798
 reconcile/utils/ocm/service_log.py,sha256=RG1f0MMn6joKaRCAm2xveSJCavdOPP1BVo9FXecDxaI,2018
@@ -777,7 +777,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev70.dist-info/METADATA,sha256=FJkN-V-v3LKs0brd8Zv51quf4hjt-0JuIfzMK9GdV44,24565
-qontract_reconcile-0.10.2.dev70.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev70.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev70.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev71.dist-info/METADATA,sha256=X2KpCP8AgWG2loIUtoCmEHxD6QOGjjixvfz9rTmUxyw,24565
+qontract_reconcile-0.10.2.dev71.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev71.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev71.dist-info/RECORD,,

reconcile/aus/models.py

@@ -77,9 +77,19 @@ class ClusterUpgradeSpec(BaseModel):
         return mutexes
 
 
+# TODO: Addon not is-a Cluster, extract a common base to inherit
 class ClusterAddonUpgradeSpec(ClusterUpgradeSpec):
     addon: OCMAddonInstallation
 
+    def version_blocked(self, version: str) -> bool:
+        addon_id = self.addon.id
+        v = f"{addon_id}/{version}"
+        return any(
+            re.search(b, v)
+            for b in self.blocked_versions
+            if b.startswith(f"{addon_id}/") or b.startswith(f"^{addon_id}/")
+        )
+
     def get_available_upgrades(self) -> list[str]:
         return self.addon.addon_version.available_upgrades
 

reconcile/utils/ocm/ocm.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import functools
-import re
 from collections.abc import Mapping
 from typing import Any
 
@@ -58,7 +57,6 @@ ADDON_UPGRADE_POLICY_DESIRED_KEYS = {
     "version",
 }
 ROUTER_DESIRED_KEYS = {"id", "listening", "dns_name", "route_selectors"}
-AUTOSCALE_DESIRED_KEYS = {"min_replicas", "max_replicas"}
 CLUSTER_ADDON_DESIRED_KEYS = {"id", "parameters"}
 
 DISABLE_UWM_ATTR = "disable_user_workload_monitoring"
@@ -71,16 +69,15 @@ class OCM:  # pylint: disable=too-many-public-methods
     OCM is an instance of OpenShift Cluster Manager.
 
     :param name: OCM instance name
-    :param url: OCM instance URL
     :param org_id: OCM org ID
+    :param ocm_env: OCM env
     :param ocm_client: the OCM API client to talk to OCM
     :param init_provision_shards: should initiate provision shards
     :param init_addons: should initiate addons
-    :param blocked_versions: versions to block upgrades for
+    :param init_version_gates: should initiate version gates
     :type init_provision_shards: bool
     :type init_addons: bool
     :type init_version_gates: bool
-    :type blocked_version: list
     """
 
     def __init__(
@@ -92,8 +89,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         init_provision_shards=False,
         init_addons=False,
         init_version_gates=False,
-        blocked_versions=None,
-        inheritVersionData: list[dict[str, Any]] | None = None,
         product_portfolio: OCMProductPortfolio | None = None,
     ):
         """Initiates access token and gets clusters information."""
@@ -110,8 +105,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         if init_addons:
             self._init_addons()
 
-        self._init_blocked_versions(blocked_versions)
-
         self.init_version_gates = init_version_gates
         self.version_gates: list[Any] = []
         if init_version_gates:
@@ -160,16 +153,6 @@ class OCM:  # pylint: disable=too-many-public-methods
             else:
                 self.not_ready_clusters.add(cluster_name)
 
-    @property
-    def non_blocked_cluster_upgrades(self) -> dict[str, list[str]]:
-        return {
-            cluster: [v for v in versions or [] if not self.version_blocked(v)]
-            for cluster, versions in self.available_cluster_upgrades.items()
-        }
-
-    def is_ready(self, cluster):
-        return cluster in self.clusters
-
     def get_product_impl(
         self, product: str, hypershift: bool | None = False
     ) -> OCMProduct:
@@ -615,45 +598,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/node_pools/" + f"{node_pool_id}"
         self._patch(api, spec)
 
-    def addon_version_blocked(self, version: str, addon_id: str) -> bool:
-        """Check if an addon version is blocked
-
-        Args:
-            version (string): version to check
-            addon_id (string): addon_id to check
-
-        Returns:
-            bool: is version blocked
-        """
-        v = f"{addon_id}/{version}"
-        return any(
-            re.search(b, v)
-            for b in self.blocked_versions
-            if b.startswith(f"{addon_id}/") or b.startswith(f"^{addon_id}/")
-        )
-
-    def version_blocked(self, version: str) -> bool:
-        """Check if a version is blocked
-
-        Args:
-            version (string): version to check
-
-        Returns:
-            bool: is version blocked
-        """
-        return any(re.search(b, version) for b in self.blocked_versions)
-
-    def get_available_upgrades(self, cluster_name: str) -> list[str]:
-        """Get available versions to upgrade for a specific cluster.
-
-        Args:
-            cluster_name (string): cluster display name to get available upgrades for
-
-        Returns:
-            list: a non-null but potentially empty list of available versions to upgrade to
-        """
-        return self.available_cluster_upgrades.get(cluster_name) or []
-
     def get_additional_routers(self, cluster):
         """Returns a list of Additional Application Routers
 
@@ -706,23 +650,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/" + f"ingresses/{router_id}"
         self._delete(api)
 
-    @staticmethod
-    def _get_autoscale(cluster):
-        autoscale = cluster["nodes"].get("autoscale_compute", None)
-        if autoscale is None:
-            return None
-        return {k: v for k, v in autoscale.items() if k in AUTOSCALE_DESIRED_KEYS}
-
-    def whoami(self):
-        api = f"{AMS_API_BASE}/v1/current_account"
-        return self._get_json(api)
-
-    def get_pull_secrets(
-        self,
-    ):
-        api = f"{AMS_API_BASE}/v1/access_token"
-        return self._post(api)
-
     def _init_addons(self):
         """Returns a list of Addons"""
         api = f"{CS_API_BASE}/v1/addons"
@@ -742,25 +669,6 @@ class OCM:  # pylint: disable=too-many-public-methods
                 return addon
         return None
 
-    def get_addon_version(self, id):
-        for addon in self.addons:
-            addon_id = addon["id"]
-            if id == addon_id:
-                return addon["version"]["id"]
-        return None
-
-    def get_version_gates(
-        self, version_prefix: str, sts_only: bool = False
-    ) -> list[dict[str, Any]]:
-        if not self.init_version_gates:
-            self._init_version_gates()
-        return [
-            g
-            for g in self.version_gates
-            if g["version_raw_id_prefix"] == version_prefix
-            and g["sts_only"] == sts_only
-        ]
-
     def get_cluster_addons(
         self,
         cluster: str,
@@ -818,20 +726,6 @@ class OCM:  # pylint: disable=too-many-public-methods
             data["parameters"]["items"] = parameters
         self._post(api, data)
 
-    def _init_blocked_versions(self, blocked_versions):
-        try:
-            self.blocked_versions = set(blocked_versions)
-        except TypeError:
-            self.blocked_versions = set()
-
-        for b in self.blocked_versions:
-            try:
-                re.compile(b)
-            except re.error:
-                raise TypeError(
-                    f"blocked version is not a valid regex expression: {b}"
-                ) from None
-
     @retry(max_attempts=10)
     def _do_get_request(self, api: str, params: Mapping[str, str]) -> dict[str, Any]:
         return self._ocm_client.get(
@@ -1055,9 +949,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
             ocm_client,
             init_provision_shards=init_provision_shards,
             init_addons=init_addons,
-            blocked_versions=ocm_info.get("blockedVersions"),
             init_version_gates=init_version_gates,
-            inheritVersionData=ocm_info.get("inheritVersionData"),
             product_portfolio=product_portfolio,
         )