qontract-reconcile 0.10.2.dev277__tar.gz → 0.10.2.dev279__tar.gz

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev277
+Version: 0.10.2.dev279
 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.dev277 → qontract_reconcile-0.10.2.dev279}/pyproject.toml

@@ -262,8 +262,6 @@ disallow_incomplete_defs = true
 [[tool.mypy.overrides]]
 # Untyped modules
 module = [
-    "reconcile.quay_base",
-    "reconcile.quay_membership",
     "reconcile.quay_mirror_org",
     "reconcile.quay_mirror",
     "reconcile.quay_permissions",
@@ -356,7 +354,6 @@ module = [
     "reconcile.test.test_openshift_saas_deploy",
     "reconcile.test.test_openshift_upgrade_watcher",
     "reconcile.test.test_prometheus_rules_tester",
-    "reconcile.test.test_quay_membership",
     "reconcile.test.test_quay_mirror_org",
     "reconcile.test.test_quay_mirror",
     "reconcile.test.test_quay_repos",
@@ -384,7 +381,6 @@ module = [
     "reconcile.test.utils.test_aws_rds",
     "reconcile.test.utils.test_expiration",
     "reconcile.test.utils.test_external_resource_spec",
-    "reconcile.test.utils.test_external_resources",
     "reconcile.test.utils.test_gpg",
     "reconcile.test.utils.test_grouping",
     "reconcile.test.utils.test_helm",

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/reconcile/aus/base.py

@@ -83,8 +83,6 @@ from reconcile.utils.ocm.upgrades import (
     create_control_plane_upgrade_policy,
     create_node_pool_upgrade_policy,
     create_upgrade_policy,
-    delete_control_plane_upgrade_policy,
-    delete_upgrade_policy,
     get_control_plane_upgrade_policies,
     get_node_pool_upgrade_policies,
     get_upgrade_policies,
@@ -467,7 +465,7 @@ class AddonUpgradePolicy(AbstractUpgradePolicy):
 
 
 class ClusterUpgradePolicy(AbstractUpgradePolicy):
-    """Class to create and delete ClusterUpgradePolicies in OCM"""
+    """Class to create ClusterUpgradePolicies in OCM"""
 
     def create(self, ocm_api: OCMBaseClient) -> None:
         policy = {
@@ -478,11 +476,7 @@ class ClusterUpgradePolicy(AbstractUpgradePolicy):
         create_upgrade_policy(ocm_api, self.cluster.id, policy)
 
     def delete(self, ocm_api: OCMBaseClient) -> None:
-        if not self.id:
-            raise ValueError(
-                "Cannot delete cluster upgrade policy without id (not created yet)"
-            )
-        delete_upgrade_policy(ocm_api, self.cluster.id, self.id)
+        raise NotImplementedError("ClusterUpgradePolicy.delete() not implemented")
 
     def summarize(self) -> str:
         details = {
@@ -509,11 +503,7 @@ class ControlPlaneUpgradePolicy(AbstractUpgradePolicy):
         create_control_plane_upgrade_policy(ocm_api, self.cluster.id, policy)
 
     def delete(self, ocm_api: OCMBaseClient) -> None:
-        if not self.id:
-            raise ValueError(
-                "Cannot delete controlplane upgrade policy without id (not created yet)"
-            )
-        delete_control_plane_upgrade_policy(ocm_api, self.cluster.id, self.id)
+        raise NotImplementedError("ControlPlaneUpgradePolicy.delete() not implemented")
 
     def summarize(self) -> str:
         details = {
@@ -527,7 +517,7 @@ class ControlPlaneUpgradePolicy(AbstractUpgradePolicy):
 
 class NodePoolUpgradePolicy(AbstractUpgradePolicy):
     node_pool: str
-    """Class to create and delete NodePoolUpgradePolicies in OCM"""
+    """Class to create NodePoolUpgradePolicies in OCM"""
 
     def create(self, ocm_api: OCMBaseClient) -> None:
         policy = {
@@ -910,38 +900,21 @@ def upgradeable_version(
 def verify_current_should_skip(
     current_state: Sequence[AbstractUpgradePolicy],
     desired: ClusterUpgradeSpec,
-    now: datetime,
-    addon_id: str = "",
-) -> tuple[bool, UpgradePolicyHandler | None]:
+) -> bool:
     current_policies = [c for c in current_state if c.cluster.id == desired.cluster.id]
     if not current_policies:
-        return False, None
+        return False
 
     # there can only be one upgrade policy per cluster
     if len(current_policies) != 1:
         raise ValueError(
             f"[{desired.org.org_id}/{desired.cluster.name}] expected only one upgrade policy"
         )
-    current = current_policies[0]
-    version = current.version  # may not exist in automatic upgrades
-    if version and not addon_id and desired.version_blocked(version):
-        next_run = current.next_run
-        if next_run and datetime.strptime(next_run, "%Y-%m-%dT%H:%M:%SZ") < now:
-            logging.warning(
-                f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] currently upgrading to blocked version '{version}'"
-            )
-            return True, None
-        logging.debug(
-            f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] found planned upgrade policy "
-            + f"with blocked version {version}"
-        )
-        return False, UpgradePolicyHandler(action="delete", policy=current)
 
-    # else
     logging.debug(
         f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster with existing upgrade policy"
     )
-    return True, None
+    return True
 
 
 def verify_schedule_should_skip(
@@ -1129,14 +1102,8 @@ def calculate_diff(
                 set_upgrading(spec.cluster.id, spec.effective_mutexes, sector_name)
                 continue
 
-        # ignore clusters with an existing upgrade policy
-        skip, delete_policy = verify_current_should_skip(
-            current_state, spec, now, addon_id
-        )
-        if skip:
+        if verify_current_should_skip(current_state, spec):
             continue
-        if delete_policy:
-            diffs.append(delete_policy)
 
         next_schedule = verify_schedule_should_skip(spec, now, addon_id)
         if not next_schedule:

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/reconcile/quay_base.py

@@ -1,13 +1,15 @@
 from collections import namedtuple
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.quay_api import QuayApi
 from reconcile.utils.secret_reader import SecretReader
 
 OrgKey = namedtuple("OrgKey", ["instance", "org_name"])
+QuayApiStore = dict[OrgKey, dict[str, Any]]
 
 
-def get_quay_api_store():
+def get_quay_api_store() -> QuayApiStore:
     """
     Returns a dictionary with a key for each Quay organization
     managed in app-interface.

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/reconcile/quay_membership.py

@@ -1,6 +1,7 @@
 import logging
 import sys
 from collections.abc import Sequence
+from typing import Any
 
 from reconcile.gql_definitions.quay_membership import quay_membership
 from reconcile.gql_definitions.quay_membership.quay_membership import (
@@ -9,13 +10,14 @@ from reconcile.gql_definitions.quay_membership.quay_membership import (
     PermissionQuayOrgTeamV1,
     UserV1,
 )
-from reconcile.quay_base import get_quay_api_store
+from reconcile.quay_base import QuayApiStore, get_quay_api_store
 from reconcile.status import ExitCodes
 from reconcile.utils import (
     expiration,
     gql,
 )
 from reconcile.utils.aggregated_list import (
+    Action,
     AggregatedDiffRunner,
     AggregatedList,
     RunnerError,
@@ -33,7 +35,7 @@ def get_permissions_for_quay_membership() -> list[PermissionQuayOrgTeamV1]:
     return [p for p in query_data.permissions if isinstance(p, PermissionQuayOrgTeamV1)]
 
 
-def process_permission(permission: PermissionQuayOrgTeamV1):
+def process_permission(permission: PermissionQuayOrgTeamV1) -> dict[str, Any]:
     """Returns a new permission object with the right keys
 
     State needs these fields: service, org, team.
@@ -52,7 +54,7 @@ def process_permission(permission: PermissionQuayOrgTeamV1):
     }
 
 
-def fetch_current_state(quay_api_store):
+def fetch_current_state(quay_api_store: QuayApiStore) -> AggregatedList:
     state = AggregatedList()
 
     for org_key, org_data in quay_api_store.items():
@@ -85,7 +87,7 @@ def get_usernames(users: Sequence[UserV1 | BotV1 | ExternalUserV1]) -> list[str]
     return [u.quay_username for u in users if u.quay_username]
 
 
-def fetch_desired_state():
+def fetch_desired_state() -> AggregatedList:
     permissions = get_permissions_for_quay_membership()
     state = AggregatedList()
 
@@ -105,14 +107,14 @@ def fetch_desired_state():
 
 
 class RunnerAction:
-    def __init__(self, dry_run, quay_api_store):
+    def __init__(self, dry_run: bool, quay_api_store: QuayApiStore):
         self.dry_run = dry_run
         self.quay_api_store = quay_api_store
 
-    def add_to_team(self):
+    def add_to_team(self) -> Action:
         label = "add_to_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -134,7 +136,7 @@ class RunnerAction:
 
         return action
 
-    def create_team(self):
+    def create_team(self) -> Action:
         """
         Create an empty team in Quay. This method avoids adding users to the
         new team. add_to_team() will handle updating the member list the
@@ -142,7 +144,7 @@ class RunnerAction:
         """
         label = "create_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -164,10 +166,10 @@ class RunnerAction:
 
         return action
 
-    def del_from_team(self):
+    def del_from_team(self) -> Action:
         label = "del_from_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -185,7 +187,7 @@ class RunnerAction:
         return action
 
 
-def run(dry_run):
+def run(dry_run: bool) -> None:
     quay_api_store = get_quay_api_store()
 
     current_state = fetch_current_state(quay_api_store)

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/reconcile/quay_mirror_org.py

@@ -290,7 +290,7 @@ class QuayMirrorOrg:
 
 
 def run(
-    dry_run,
+    dry_run: bool,
     control_file_dir: str | None,
     compare_tags: bool | None,
     compare_tags_interval: int,

{qontract_reconcile-0.10.2.dev277 → qontract_reconcile-0.10.2.dev279}/reconcile/utils/ocm/upgrades.py

@@ -77,15 +77,6 @@ def create_upgrade_policy(ocm_api: OCMBaseClient, cluster_id: str, spec: dict) -
     ocm_api.post(f"{build_cluster_url(cluster_id)}/upgrade_policies", spec)
 
 
-def delete_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
-) -> None:
-    """
-    Deletes an existing Upgrade Policy
-    """
-    ocm_api.delete(f"{build_cluster_url(cluster_id)}/upgrade_policies/{policy_id}")
-
-
 #
 # CONTROL PLANE UPGRADE POLICIES
 #
@@ -120,17 +111,6 @@ def create_control_plane_upgrade_policy(
     )
 
 
-def delete_control_plane_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, upgrade_policy_id: str
-) -> None:
-    """
-    Deletes an existing Control Plane Upgrade Policy
-    """
-    ocm_api.delete(
-        f"{build_cluster_url(cluster_id)}/control_plane/upgrade_policies/{upgrade_policy_id}"
-    )
-
-
 #
 # NODE POOLUPGRADE POLICIES
 #