qontract-reconcile 0.10.2.dev269__tar.gz → 0.10.2.dev271__tar.gz

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/PKG-INFO

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

@@ -262,16 +262,6 @@ disallow_incomplete_defs = true
 [[tool.mypy.overrides]]
 # Untyped modules
 module = [
-    "reconcile.ocm_upgrade_scheduler_org_updater",
-    "reconcile.openshift_base",
-    "reconcile.openshift_clusterrolebindings",
-    "reconcile.openshift_limitranges",
-    "reconcile.openshift_namespace_labels",
-    "reconcile.openshift_network_policies",
-    "reconcile.openshift_resourcequotas",
-    "reconcile.openshift_rolebindings",
-    "reconcile.openshift_routes",
-    "reconcile.openshift_vault_secrets",
     "reconcile.quay_base",
     "reconcile.quay_membership",
     "reconcile.quay_mirror_org",
@@ -364,12 +354,7 @@ module = [
     "reconcile.test.test_jump_host",
     "reconcile.test.test_make",
     "reconcile.test.test_ocm_update_recommended_version",
-    "reconcile.test.test_ocm_upgrade_scheduler_org_updater",
-    "reconcile.test.test_openshift_base",
-    "reconcile.test.test_openshift_namespace_labels",
     "reconcile.test.test_openshift_namespaces",
-    "reconcile.test.test_openshift_resource",
-    "reconcile.test.test_openshift_resources_base",
     "reconcile.test.test_openshift_saas_deploy_change_tester",
     "reconcile.test.test_openshift_saas_deploy",
     "reconcile.test.test_openshift_upgrade_watcher",

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/aws_iam_keys.py

@@ -6,6 +6,7 @@ from typing import Any
 
 from reconcile import queries
 from reconcile.utils.aws_api import AWSApi
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.state import State, init_state
 from reconcile.utils.terrascript_aws_client import TerrascriptClient as Terrascript
@@ -76,7 +77,7 @@ def cleanup(working_dirs: Mapping[str, str]) -> None:
 @defer
 def run(
     dry_run: bool,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     disable_service_account_keys: bool = False,
     account_name: str | None = None,
     defer: Callable | None = None,

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/aws_saml_idp/integration.py

@@ -21,6 +21,7 @@ from reconcile.gql_definitions.aws_saml_idp.aws_accounts import (
 from reconcile.status import ExitCodes
 from reconcile.utils import gql
 from reconcile.utils.aws_api import AWSApi
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.extended_early_exit import (
@@ -41,7 +42,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(1, 0, 0)
 
 
 class AwsSamlIdpIntegrationParams(PydanticRunParams):
-    thread_pool_size: int = 10
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE
     print_to_file: str | None = None
     enable_deletion: bool = False
     # integration specific parameters

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/aws_saml_roles/integration.py

@@ -25,6 +25,7 @@ from reconcile.status import ExitCodes
 from reconcile.utils import gql
 from reconcile.utils.aws_api import AWSApi
 from reconcile.utils.aws_helper import unique_sso_aws_accounts
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.extended_early_exit import (
@@ -45,7 +46,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(1, 0, 0)
 
 
 class AwsSamlRolesIntegrationParams(PydanticRunParams):
-    thread_pool_size: int = 10
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE
     print_to_file: str | None = None
     enable_deletion: bool = False
     # integration specific parameters

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/aws_support_cases_sos.py

@@ -8,6 +8,7 @@ from reconcile import (
     queries,
 )
 from reconcile.utils.aws_api import AWSApi
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.mr import CreateDeleteAwsAccessKey
 
@@ -71,7 +72,9 @@ def act(
 
 
 def run(
-    dry_run: bool, gitlab_project_id: str | None = None, thread_pool_size: int = 10
+    dry_run: bool,
+    gitlab_project_id: str | None = None,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
 ) -> None:
     accounts = filter_accounts(queries.get_aws_accounts())
     settings = queries.get_app_interface_settings()

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/cli.py

@@ -27,6 +27,7 @@ from reconcile.utils.binary import (
     binary,
     binary_version,
 )
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.exceptions import PrintToFileInGitRepositoryError
 from reconcile.utils.git import is_file_in_git_repo
 from reconcile.utils.gql import GqlApiSingleton
@@ -192,7 +193,7 @@ def gql_url_print(function: Callable) -> Callable:
     return function
 
 
-def threaded(default: int = 10) -> Callable:
+def threaded(default: int = DEFAULT_THREAD_POOL_SIZE) -> Callable:
     def f(function: Callable) -> Callable:
         opt = "--thread-pool-size"
         msg = "number of threads to run in parallel."

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/dashdotdb_dvo.py

@@ -19,6 +19,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.typed_queries.clusters_minimal import get_clusters_minimal
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.secret_reader import (
     SecretReaderBase,
     create_secret_reader,
@@ -254,7 +255,7 @@ class DashdotdbDVO(DashdotdbBase):
 
 def run(
     dry_run: bool = False,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     cluster_name: str | None = None,
 ) -> None:
     vault_settings = get_app_interface_vault_settings()

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/dashdotdb_slo.py

@@ -15,6 +15,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.utils import gql
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.secret_reader import (
     SecretReaderBase,
     create_secret_reader,
@@ -106,7 +107,9 @@ class DashdotdbSLO(DashdotdbBase):
             self._close_token()
 
 
-def run(dry_run: bool = False, thread_pool_size: int = 10) -> None:
+def run(
+    dry_run: bool = False, thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE
+) -> None:
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     dashdotdb_slo = DashdotdbSLO(

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/endpoints_discovery/integration.py

@@ -27,6 +27,7 @@ from reconcile.typed_queries.app_interface_repo_url import get_app_interface_rep
 from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
 from reconcile.utils import gql
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.differ import diff_any_iterables
 from reconcile.utils.disabled_integrations import integration_is_enabled
@@ -49,7 +50,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(1, 1, 0)
 
 
 class EndpointsDiscoveryIntegrationParams(PydanticRunParams):
-    thread_pool_size: int = 10
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE
     internal: bool | None = None
     use_jump_host: bool = True
     cluster_name: set[str] | None = None

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/gabi_authorized_users.py

@@ -16,6 +16,7 @@ import reconcile.openshift_base as ob
 from reconcile import queries
 from reconcile.status import ExitCodes
 from reconcile.utils.aggregated_list import RunnerError
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.external_resources import get_external_resource_specs
@@ -110,7 +111,7 @@ def fetch_desired_state(
 @defer
 def run(
     dry_run: bool,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     internal: bool | None = None,
     use_jump_host: bool = True,
     defer: Callable | None = None,

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/gitlab_owners.py

@@ -7,6 +7,7 @@ from gitlab.v4.objects import ProjectMergeRequest
 from sretoolbox.utils import threaded
 
 from reconcile import queries
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import (
     GitLabApi,
@@ -412,7 +413,7 @@ def act(
         ])
 
 
-def run(dry_run: bool, thread_pool_size: int = 10) -> None:
+def run(dry_run: bool, thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE) -> None:
     instance = queries.get_gitlab_instance()
     settings = queries.get_app_interface_settings()
     repos = queries.get_repos_gitlab_owner(server=instance["url"])

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/gitlab_permissions.py

@@ -14,6 +14,7 @@ from sretoolbox.utils import threaded
 
 from reconcile import queries
 from reconcile.utils import batches
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.differ import diff_mappings
 from reconcile.utils.gitlab_api import GitLabApi
@@ -194,7 +195,9 @@ def create_user_ids_query(ids: Iterable[str]) -> dict[str, str]:
 
 @defer
 def run(
-    dry_run: bool, thread_pool_size: int = 10, defer: Callable | None = None
+    dry_run: bool,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
+    defer: Callable | None = None,
 ) -> None:
     instance = queries.get_gitlab_instance()
     settings = queries.get_app_interface_settings()

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/glitchtip_project_dsn/integration.py

@@ -25,6 +25,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.utils import gql
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.glitchtip import GlitchtipClient
@@ -165,7 +166,7 @@ def projects_query(query_func: Callable) -> list[GlitchtipProjectV1]:
 @defer
 def run(
     dry_run: bool,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     internal: bool | None = None,
     use_jump_host: bool = True,
     instance: str | None = None,

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/integrations_manager.py

@@ -31,6 +31,7 @@ from reconcile.utils import (
     gql,
     helm,
 )
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.oc import oc_process
 from reconcile.utils.openshift_resource import (
@@ -234,7 +235,7 @@ def run(
     dry_run: bool,
     environment_name: str | None,
     integration_runtime_meta: dict[str, IntegrationMeta],
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     internal: bool = False,
     use_jump_host: bool = True,
     image_tag_from_ref: dict[str, str] | None = None,

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/ocm_clusters.py

@@ -20,6 +20,7 @@ from reconcile.ocm.types import (
     ROSAOcmAwsStsAttrs,
 )
 from reconcile.status import ExitCodes
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.jobcontroller.controller import build_job_controller
 from reconcile.utils.ocm.products import (
@@ -327,7 +328,7 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
 
 class OcmClustersParams(PydanticRunParams):
     gitlab_project_id: str | None = None
-    thread_pool_size: int = 10
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE
 
     # rosa job controller params
     job_controller_cluster: str | None = None

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/ocm_external_configuration_labels.py

@@ -6,6 +6,7 @@ from typing import Any
 
 from reconcile import queries
 from reconcile.status import ExitCodes
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import OCMMap
 
@@ -115,7 +116,7 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
 def run(
     dry_run: bool,
     gitlab_project_id: str | None = None,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
 ) -> None:
     clusters = queries.get_clusters()
     clusters = [

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/ocm_groups.py

@@ -14,6 +14,7 @@ from reconcile import (
     queries,
 )
 from reconcile.status import ExitCodes
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import OCMMap
 from reconcile.utils.ocm.base import OCMClusterGroupId
@@ -80,7 +81,7 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
     return cluster.get("ocm") is not None
 
 
-def run(dry_run: bool, thread_pool_size: int = 10) -> None:
+def run(dry_run: bool, thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE) -> None:
     clusters = queries.get_clusters()
     if not clusters:
         logging.debug("No clusters found in app-interface")

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -1,5 +1,6 @@
 import json
 import logging
+from collections.abc import Mapping
 from typing import Any
 
 import yaml
@@ -19,10 +20,10 @@ QONTRACT_INTEGRATION = "ocm-upgrade-scheduler-org-updater"
 
 
 def render_policy(
-    template: dict[str, Any],
+    template: Mapping[str, Any],
     cluster_spec: OCMSpec,
-    labels: dict[str, str],
-    settings: dict[str, Any] | None = None,
+    labels: Mapping[str, str],
+    settings: Mapping[str, Any] | None = None,
 ) -> dict[str, Any]:
     body = template["path"]["content"]
     type = template.get("type") or "jinja2"
@@ -36,7 +37,7 @@ def render_policy(
     return yaml.safe_load(rendered)
 
 
-def run(dry_run, gitlab_project_id):
+def run(dry_run: bool, gitlab_project_id: str | None) -> None:
     settings = queries.get_app_interface_settings()
     ocms = queries.get_openshift_cluster_managers()
     for ocm_info in ocms:
@@ -55,7 +56,7 @@ def run(dry_run, gitlab_project_id):
         )
         ocm_name = ocm_info["name"]
         ocm_path = ocm_info["path"]
-        ocm = ocm_map[ocm_name]
+        ocm = ocm_map.get(ocm_name)
 
         for ocm_cluster_name, ocm_cluster_spec in ocm.clusters.items():
             found = [

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/openshift_base.py

@@ -4,6 +4,7 @@ from collections import Counter
 from collections.abc import (
     Iterable,
     Mapping,
+    MutableMapping,
     Sequence,
 )
 from dataclasses import (
@@ -27,6 +28,7 @@ from reconcile.utils import (
     differ,
     metrics,
 )
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.oc import (
     DeploymentFieldIsImmutableError,
     FieldIsImmutableError,
@@ -104,8 +106,7 @@ class HasNameAndAuthService(Protocol):
     name: str
 
     @property
-    def auth(self) -> Sequence[HasService]:
-        pass
+    def auth(self) -> Sequence[HasService]: ...
 
 
 class HasOrgAndGithubUsername(Protocol):
@@ -297,7 +298,7 @@ def populate_current_state(
     integration: str,
     integration_version: str,
     caller: str | None = None,
-):
+) -> None:
     # if spec.oc is None: - oc can't be none because init_namespace_specs_to_fetch does not create specs if oc is none
     #    return
     if not spec.oc.is_kind_supported(spec.kind):
@@ -330,7 +331,7 @@ def populate_current_state(
 def fetch_current_state(
     namespaces: Iterable[Mapping] | None = None,
     clusters: Iterable[Mapping] | None = None,
-    thread_pool_size: int | None = None,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     integration: str | None = None,
     integration_version: str | None = None,
     override_managed_types: Iterable[str] | None = None,
@@ -346,7 +347,7 @@ def fetch_current_state(
     oc_map = OC_Map(
         namespaces=namespaces,
         clusters=clusters,
-        integration=integration,
+        integration=integration or "",
         settings=settings,
         internal=internal,
         use_jump_host=use_jump_host,
@@ -377,7 +378,7 @@ def fetch_current_state(
 
 
 @retry(max_attempts=30)
-def wait_for_namespace_exists(oc, namespace):
+def wait_for_namespace_exists(oc: OCCli, namespace: str) -> None:
     if not oc.project_exists(namespace):
         raise StatusCodeError(f"namespace {namespace} does not exist")
 
@@ -541,13 +542,20 @@ def apply(
         oc.recycle_pods(dry_run, namespace, resource_type, resource)
 
 
-def create(dry_run, oc_map, cluster, namespace, resource_type, resource):
+def create(
+    dry_run: bool,
+    oc_map: ClusterMap,
+    cluster: str,
+    namespace: str,
+    resource_type: str,
+    resource: OR,
+) -> None:
     logging.info(["create", cluster, namespace, resource_type, resource.name])
 
     oc = oc_map.get(cluster)
-    if not oc:
+    if isinstance(oc, OCLogMsg):
         logging.log(level=oc.log_level, msg=oc.message)
-        return None
+        return
     if not dry_run:
         annotated = resource.annotate()
         oc.create(namespace, annotated)
@@ -585,7 +593,7 @@ def delete(
         return None
 
 
-def check_unused_resource_types(ri):
+def check_unused_resource_types(ri: ResourceInventory) -> None:
     for cluster, namespace, resource_type, data in ri:
         if not data["desired"].items():
             msg = (
@@ -1036,18 +1044,18 @@ def _realize_resource_data_3way_diff(
 
 
 def realize_data(
-    dry_run,
+    dry_run: bool,
     oc_map: ClusterMap,
     ri: ResourceInventory,
-    thread_pool_size,
-    take_over=False,
-    caller=None,
-    all_callers=None,
-    wait_for_namespace=False,
-    no_dry_run_skip_compare=False,
-    override_enable_deletion=None,
-    recycle_pods=True,
-):
+    thread_pool_size: int,
+    take_over: bool = False,
+    caller: str | None = None,
+    all_callers: Sequence[str] | None = None,
+    wait_for_namespace: bool = False,
+    no_dry_run_skip_compare: bool = False,
+    override_enable_deletion: bool | None = None,
+    recycle_pods: bool = True,
+) -> list[dict[str, Any]]:
     """
     Realize the current state to the desired state.
 
@@ -1160,7 +1168,9 @@ def validate_planned_data(ri: ResourceInventory, oc_map: ClusterMap) -> None:
 
 
 @retry(exceptions=(ValidationError), max_attempts=200)
-def validate_realized_data(actions: Iterable[dict[str, str]], oc_map: ClusterMap):
+def validate_realized_data(
+    actions: Iterable[dict[str, str]], oc_map: ClusterMap
+) -> None:
     """
     Validate the realized desired state.
 
@@ -1274,7 +1284,9 @@ def validate_realized_data(actions: Iterable[dict[str, str]], oc_map: ClusterMap
                     raise ValidationError(name)
 
 
-def follow_logs(oc_map, actions, io_dir):
+def follow_logs(
+    oc_map: ClusterMap, actions: Iterable[Mapping[str, Any]], io_dir: str
+) -> None:
     """
     Collect the logs from the owned pods into files in io_dir.
 
@@ -1295,21 +1307,29 @@ def follow_logs(oc_map, actions, io_dir):
             logging.info(["collecting", cluster, namespace, kind, name])
 
             oc = oc_map.get(cluster)
-            if not oc:
+            if isinstance(oc, OCLogMsg):
                 logging.log(level=oc.log_level, msg=oc.message)
                 continue
 
             if kind == "Job":
                 oc.job_logs(namespace, name, follow=True, output=io_dir)
             if kind == "ClowdJobInvocation":
+                if isinstance(oc, OCLogMsg):
+                    logging.log(level=oc.log_level, msg=oc.message)
+                    continue
                 resource = oc.get(namespace, kind, name=name)
                 jobs = resource.get("status", {}).get("jobMap", {})
                 for jn in jobs:
                     logging.info(["collecting", cluster, namespace, kind, jn])
+                    if isinstance(oc, OCLogMsg):
+                        logging.log(level=oc.log_level, msg=oc.message)
+                        continue
                     oc.job_logs(namespace, jn, follow=True, output=io_dir)
 
 
-def aggregate_shared_resources(namespace_info, shared_resources_type):
+def aggregate_shared_resources(
+    namespace_info: MutableMapping[str, Any], shared_resources_type: str
+) -> None:
     """This function aggregates shared resources of the desired type
     from a shared resources file to the appropriate namespace section."""
     supported_shared_resources_types = [
@@ -1348,15 +1368,13 @@ class HasOpenshiftServiceAccountTokens(Protocol):
 @runtime_checkable
 class HasSharedResourcesOpenShiftResources(Protocol):
     @property
-    def shared_resources(self) -> Sequence[HasOpenShiftResources] | None:
-        pass
+    def shared_resources(self) -> Sequence[HasOpenShiftResources] | None: ...
 
 
 @runtime_checkable
 class HasSharedResourcesOpenshiftServiceAccountTokens(Protocol):
     @property
-    def shared_resources(self) -> Sequence[HasOpenshiftServiceAccountTokens] | None:
-        pass
+    def shared_resources(self) -> Sequence[HasOpenshiftServiceAccountTokens] | None: ...
 
 
 @runtime_checkable

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/openshift_clusterrolebindings.py

@@ -1,5 +1,6 @@
 import contextlib
 import sys
+from collections.abc import Callable
 
 import reconcile.openshift_base as ob
 from reconcile import queries
@@ -7,9 +8,13 @@ from reconcile.utils import (
     expiration,
     gql,
 )
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.openshift_resource import OpenshiftResource as OR
-from reconcile.utils.openshift_resource import ResourceKeyExistsError
+from reconcile.utils.openshift_resource import (
+    ResourceInventory,
+    ResourceKeyExistsError,
+)
 from reconcile.utils.semver_helper import make_semver
 
 ROLES_QUERY = """
@@ -42,7 +47,7 @@ QONTRACT_INTEGRATION = "openshift-clusterrolebindings"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def construct_user_oc_resource(role, user):
+def construct_user_oc_resource(role: str, user: str) -> tuple[OR, str]:
     name = f"{role}-{user}"
     # Note: In OpenShift 4.x this resource is in rbac.authorization.k8s.io/v1
     body = {
@@ -60,7 +65,7 @@ def construct_user_oc_resource(role, user):
     )
 
 
-def construct_sa_oc_resource(role, namespace, sa_name):
+def construct_sa_oc_resource(role: str, namespace: str, sa_name: str) -> tuple[OR, str]:
     name = f"{role}-{namespace}-{sa_name}"
     # Note: In OpenShift 4.x this resource is in rbac.authorization.k8s.io/v1
     body = {
@@ -80,7 +85,9 @@ def construct_sa_oc_resource(role, namespace, sa_name):
     )
 
 
-def fetch_desired_state(ri, oc_map):
+def fetch_desired_state(
+    ri: ResourceInventory | None, oc_map: ob.ClusterMap
+) -> list[dict[str, str]]:
     gqlapi = gql.get_api()
     roles: list[dict] = expiration.filter(gqlapi.query(ROLES_QUERY)["roles"])
     users_desired_state = []
@@ -153,7 +160,13 @@ def fetch_desired_state(ri, oc_map):
 
 
 @defer
-def run(dry_run, thread_pool_size=10, internal=None, use_jump_host=True, defer=None):
+def run(
+    dry_run: bool,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
+    internal: bool | None = None,
+    use_jump_host: bool = True,
+    defer: Callable | None = None,
+) -> None:
     clusters = [
         cluster_info
         for cluster_info in queries.get_clusters()
@@ -169,7 +182,8 @@ def run(dry_run, thread_pool_size=10, internal=None, use_jump_host=True, defer=N
         internal=internal,
         use_jump_host=use_jump_host,
     )
-    defer(oc_map.cleanup)
+    if defer:
+        defer(oc_map.cleanup)
     fetch_desired_state(ri, oc_map)
     ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)

{qontract_reconcile-0.10.2.dev269 → qontract_reconcile-0.10.2.dev271}/reconcile/openshift_groups.py

@@ -25,6 +25,7 @@ from reconcile.utils import (
     expiration,
     gql,
 )
+from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.defer import defer
 from reconcile.utils.oc_map import (
     OCLogMsg,
@@ -256,7 +257,7 @@ def act(diff: Mapping[str, str | None], oc_map: ClusterMap) -> None:
 @defer
 def run(
     dry_run: bool,
-    thread_pool_size: int = 10,
+    thread_pool_size: int = DEFAULT_THREAD_POOL_SIZE,
     internal: bool | None = None,
     use_jump_host: bool = True,
     defer: Callable | None = None,