qontract-reconcile 0.10.1rc879__py3-none-any.whl → 0.10.1rc894__py3-none-any.whl

reconcile/openshift_namespace_labels.py

@@ -5,11 +5,7 @@ from collections.abc import (
     Generator,
 )
 from threading import Lock
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 from kubernetes.client.exceptions import ApiException
 from sretoolbox.utils import threaded
@@ -47,9 +43,9 @@ CURRENT = "current"
 CHANGED = "changed"
 UPDATED_MANAGED = "updated-managed"
 
-Labels = dict[str, Optional[str]]
+Labels = dict[str, str | None]
 LabelKeys = list[str]
-LabelsOrKeys = Union[Labels, LabelKeys]
+LabelsOrKeys = Labels | LabelKeys
 Types = dict[str, LabelsOrKeys]
 
 InternalLabelInventory = dict[str, dict[str, Types]]
@@ -104,8 +100,8 @@ class LabelInventory:
         cluster: str,
         namespace: str,
         type: str,
-        default: Optional[LabelsOrKeys] = None,
-    ) -> Optional[LabelsOrKeys]:
+        default: LabelsOrKeys | None = None,
+    ) -> LabelsOrKeys | None:
         """Get the labels or keys for the given cluster / namespace / type"""
         return self._inv.get(cluster, {}).get(namespace, {}).get(type, default)
 
@@ -293,9 +289,7 @@ def get_managed(inventory: LabelInventory, state: State) -> None:
         inventory.set(cluster=cluster, namespace=ns_name, type=MANAGED, labels=managed)
 
 
-def lookup_namespaces(
-    cluster: str, oc_map: OCMap
-) -> tuple[str, Optional[dict[str, Any]]]:
+def lookup_namespaces(cluster: str, oc_map: OCMap) -> tuple[str, dict[str, Any] | None]:
     """
     Retrieve all namespaces from the given cluster
     """
@@ -410,9 +404,9 @@ class NamespaceLabelError(Exception):
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
     raise_errors: bool = False,
 ) -> None:
     _LOG.debug("Collecting GQL data ...")

reconcile/openshift_namespaces.py

@@ -6,10 +6,7 @@ from collections.abc import (
     Mapping,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -145,11 +142,11 @@ def check_results(
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    cluster_name: Optional[Sequence[str]] = None,
-    namespace_name: Optional[Sequence[str]] = None,
-    defer: Optional[Callable] = None,
+    cluster_name: Sequence[str] | None = None,
+    namespace_name: Sequence[str] | None = None,
+    defer: Callable | None = None,
 ) -> None:
     all_namespaces = get_namespaces_minimal()
     shard_namespaces, duplicates = get_shard_namespaces(all_namespaces)

reconcile/openshift_network_policies.py

@@ -94,12 +94,10 @@ def fetch_desired_state(namespaces, ri, oc_map):
             source_cluster = source_namespace_info["cluster"]["name"]
             if cluster != source_cluster:
                 ri.register_error()
-                msg = ("[{}/{}] Network Policy from cluster '{}' not allowed.").format(
-                    cluster, namespace, source_cluster
-                )
+                msg = f"[{cluster}/{namespace}] Network Policy from cluster '{source_cluster}' not allowed."
                 logging.error(msg)
                 continue
-            resource_name = "allow-from-{}-namespace".format(source_namespace)
+            resource_name = f"allow-from-{source_namespace}-namespace"
             oc_resource = construct_oc_resource(resource_name, source_namespace)
             ri.add_desired(
                 cluster,

reconcile/openshift_resources_base.py

@@ -20,9 +20,7 @@ from textwrap import indent
 from threading import Lock
 from typing import (
     Any,
-    Optional,
     Protocol,
-    Tuple,
 )
 from unittest.mock import DEFAULT, patch
 
@@ -479,9 +477,7 @@ def fetch_provider_route(
             tls[k] = v
             continue
 
-        msg = "Route secret '{}' key '{}' not in valid keys {}".format(
-            tls_path, k, valid_keys
-        )
+        msg = f"Route secret '{tls_path}' key '{k}' not in valid keys {valid_keys}"
         _locked_info_log(msg)
 
     host = openshift_resource.body["spec"].get("host")
@@ -504,7 +500,7 @@ def fetch_openshift_resource(
     provider = resource["provider"]
     if provider == "resource":
         path = resource["resource"]["path"]
-        _locked_debug_log("Processing {}: {}".format(provider, path))
+        _locked_debug_log(f"Processing {provider}: {path}")
         validate_json = resource.get("validate_json") or False
         add_path_to_prom_rules = resource.get("add_path_to_prom_rules", True)
         validate_alertmanager_config = (
@@ -524,7 +520,7 @@ def fetch_openshift_resource(
         )
     elif provider == "resource-template":
         path = resource["resource"]["path"]
-        _locked_debug_log("Processing {}: {}".format(provider, path))
+        _locked_debug_log(f"Processing {provider}: {path}")
         add_path_to_prom_rules = resource.get("add_path_to_prom_rules", True)
         validate_alertmanager_config = (
             resource.get("validate_alertmanager_config") or False
@@ -557,12 +553,12 @@ def fetch_openshift_resource(
                 settings=settings,
             )
         except Exception as e:
-            msg = "could not render template at path {}\n{}".format(path, e)
+            msg = f"could not render template at path {path}\n{e}"
             raise ResourceTemplateRenderError(msg)
     elif provider == "vault-secret":
         path = resource["path"]
         version = resource["version"]
-        _locked_debug_log("Processing {}: {} - {}".format(provider, path, version))
+        _locked_debug_log(f"Processing {provider}: {path} - {version}")
         rn = resource["name"]
         name = path.split("/")[-1] if rn is None else rn
         rl = resource["labels"]
@@ -595,7 +591,7 @@ def fetch_openshift_resource(
             raise FetchSecretError(e)
     elif provider == "route":
         path = resource["resource"]["path"]
-        _locked_debug_log("Processing {}: {}".format(provider, path))
+        _locked_debug_log(f"Processing {provider}: {path}")
         tls_path = resource["vault_tls_secret_path"]
         tls_version = resource["vault_tls_secret_version"]
         openshift_resource = fetch_provider_route(
@@ -603,7 +599,7 @@ def fetch_openshift_resource(
         )
     elif provider == "prometheus-rule":
         path = resource["resource"]["path"]
-        _locked_debug_log("Processing {}: {}".format(provider, path))
+        _locked_debug_log(f"Processing {provider}: {path}")
         add_path_to_prom_rules = resource.get("add_path_to_prom_rules", True)
         tv = {}
         if resource["variables"]:
@@ -631,7 +627,7 @@ def fetch_openshift_resource(
                 settings=settings,
             )
         except Exception as e:
-            msg = "could not render template at path {}\n{}".format(path, e)
+            msg = f"could not render template at path {path}\n{e}"
             raise ResourceTemplateRenderError(msg)
 
     else:
@@ -684,7 +680,7 @@ def fetch_desired_state(
         UnknownProviderError,
     ) as e:
         ri.register_error()
-        msg = "[{}/{}] {}".format(cluster, namespace, str(e))
+        msg = f"[{cluster}/{namespace}] {str(e)}"
         _locked_error_log(msg)
         return
 
@@ -702,9 +698,7 @@ def fetch_desired_state(
         # combination was not initialized, meaning that it shouldn't be
         # managed. But someone is trying to add it via app-interface
         ri.register_error()
-        msg = "[{}/{}] unknown kind: {}. hint: is it missing from managedResourceTypes?".format(
-            cluster, namespace, openshift_resource.kind
-        )
+        msg = f"[{cluster}/{namespace}] unknown kind: {openshift_resource.kind}. hint: is it missing from managedResourceTypes?"
         _locked_error_log(msg)
         return
     except ResourceKeyExistsError:
@@ -712,18 +706,14 @@ def fetch_desired_state(
         # a desired resource with the same name and
         # the same type was already added previously
         ri.register_error()
-        msg = ("[{}/{}] desired item already exists: {}/{}.").format(
-            cluster, namespace, openshift_resource.kind, openshift_resource.name
-        )
+        msg = f"[{cluster}/{namespace}] desired item already exists: {openshift_resource.kind}/{openshift_resource.name}."
         _locked_error_log(msg)
         return
     except ResourceNotManagedError:
         # This is failing because the resource name is
         # not in the list of resource names that are managed
         ri.register_error()
-        msg = "[{}/{}] desired item is not managed: {}/{}.".format(
-            cluster, namespace, openshift_resource.kind, openshift_resource.name
-        )
+        msg = f"[{cluster}/{namespace}] desired item is not managed: {openshift_resource.kind}/{openshift_resource.name}."
         _locked_error_log(msg)
         return
 
@@ -1000,7 +990,7 @@ class CheckClusterScopedResourceNames:
 @dataclass
 class CheckClusterScopedResourceDuplicates:
     oc_map: OC_Map
-    all_namespaces: Optional[Iterable[Mapping]] = None
+    all_namespaces: Iterable[Mapping] | None = None
 
     def check(self) -> list[Exception]:
         errors: list[Exception] = []
@@ -1022,13 +1012,13 @@ class CheckClusterScopedResourceDuplicates:
 
     def _find_resource_duplicates(
         self, cluster_cs_resources: dict[str, dict[str, dict[str, list[str]]]]
-    ) -> list[Tuple[str, str, str, list[str]]]:
+    ) -> list[tuple[str, str, str, list[str]]]:
         # ) -> dict[Tuple[str, str, str], list[str]]:
         """Finds cluster resource duplicates by kind/name.
         :param cluster_cs_resources
         :return: duplicates as [(cluster, kind, name, [namespaces])]
         """
-        duplicates: list[Tuple[str, str, str, list[str]]] = []
+        duplicates: list[tuple[str, str, str, list[str]]] = []
 
         for cluster, cluster_resources in cluster_cs_resources.items():
             _kind_name: dict[str, dict[str, list[str]]] = {}
@@ -1048,7 +1038,7 @@ def check_cluster_scoped_resources(
     oc_map: OC_Map,
     ri: ResourceInventory,
     namespaces: Iterable[Mapping[str, Any]],
-    all_namespaces: Optional[Iterable[Mapping[str, Any]]] = None,
+    all_namespaces: Iterable[Mapping[str, Any]] | None = None,
 ) -> bool:
     checks = [
         CheckClusterScopedResourceNames(oc_map, ri, namespaces),
@@ -1069,7 +1059,7 @@ def check_cluster_scoped_resources(
 def get_cluster_scoped_resources(
     oc_map: OC_Map,
     clusters: Iterable[str],
-    namespaces: Optional[Iterable[Mapping[str, Any]]] = None,
+    namespaces: Iterable[Mapping[str, Any]] | None = None,
     thread_pool_size: int = 10,
 ) -> dict[str, dict[str, dict[str, list[str]]]]:
     """Returns cluster scoped resources for a list of clusters
@@ -1106,7 +1096,7 @@ def get_cluster_scoped_resources(
 def _get_namespace_cluster_scoped_resources(
     namespace: Mapping,
     oc_map: OC_Map,
-) -> Tuple[str, str, dict[str, dict[str, Any]]]:
+) -> tuple[str, str, dict[str, dict[str, Any]]]:
     """Returns all non-namespaced resources defined in a namespace manifest.
 
     :param namespace: the namespace dict
@@ -1125,7 +1115,7 @@ def _get_namespace_cluster_scoped_resources(
 
 
 def early_exit_desired_state(
-    providers: list[str], resource_schema_filter: Optional[str] = None
+    providers: list[str], resource_schema_filter: str | None = None
 ) -> dict[str, Any]:
     settings = queries.get_secret_reader_settings()
     namespaces, _ = get_namespaces(

reconcile/openshift_saas_deploy.py

@@ -3,7 +3,6 @@ import logging
 import os
 import sys
 from collections.abc import Callable
-from typing import Optional
 
 import reconcile.openshift_base as ob
 from reconcile import (
@@ -68,9 +67,9 @@ def slack_notify(
     ri: ResourceInventory,
     console_url: str,
     in_progress: bool,
-    trigger_integration: Optional[str] = None,
-    trigger_reason: Optional[str] = None,
-    skip_successful_notifications: Optional[bool] = False,
+    trigger_integration: str | None = None,
+    trigger_reason: str | None = None,
+    skip_successful_notifications: bool | None = False,
 ) -> None:
     success = not ri.has_error_registered()
     # if the deployment doesn't want any notifications for successful
@@ -112,12 +111,12 @@ def run(
     thread_pool_size: int = 10,
     io_dir: str = "throughput/",
     use_jump_host: bool = True,
-    saas_file_name: Optional[str] = None,
-    env_name: Optional[str] = None,
-    trigger_integration: Optional[str] = None,
-    trigger_reason: Optional[str] = None,
-    saas_file_list: Optional[SaasFileList] = None,
-    defer: Optional[Callable] = None,
+    saas_file_name: str | None = None,
+    env_name: str | None = None,
+    trigger_integration: str | None = None,
+    trigger_reason: str | None = None,
+    saas_file_list: SaasFileList | None = None,
+    defer: Callable | None = None,
 ) -> None:
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)

reconcile/openshift_saas_deploy_change_tester.py

@@ -1,10 +1,7 @@
 import logging
 import sys
 from collections.abc import Iterable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from pydantic import BaseModel
 from sretoolbox.utils import threaded
@@ -37,7 +34,7 @@ class Definition(BaseModel):
 class State(BaseModel):
     saas_file_path: str
     saas_file_name: str
-    saas_file_deploy_resources: Optional[DeployResourcesV1]
+    saas_file_deploy_resources: DeployResourcesV1 | None
     resource_template_name: str
     cluster: str
     namespace: str
@@ -47,10 +44,10 @@ class State(BaseModel):
     parameters: dict[str, Any]
     secret_parameters: dict[str, VaultSecret]
     saas_file_definitions: Definition
-    upstream: Optional[SaasResourceTemplateTargetUpstreamV1]
-    disable: Optional[bool]
-    delete: Optional[bool]
-    target_path: Optional[str]
+    upstream: SaasResourceTemplateTargetUpstreamV1 | None
+    disable: bool | None
+    delete: bool | None
+    target_path: str | None
 
 
 def osd_run_wrapper(
@@ -58,7 +55,7 @@ def osd_run_wrapper(
     dry_run: bool,
     available_thread_pool_size: int,
     use_jump_host: bool,
-    saas_file_list: Optional[SaasFileList],
+    saas_file_list: SaasFileList | None,
 ) -> int:
     saas_file_name, env_name = spec
     exit_code = 0

reconcile/openshift_saas_deploy_trigger_base.py

@@ -1,10 +1,7 @@
 import logging
 from collections.abc import Callable
 from threading import Lock
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -63,7 +60,7 @@ def run(
     internal: bool,
     use_jump_host: bool,
     include_trigger_trace: bool,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> bool:
     """Run trigger integration
 
@@ -327,13 +324,13 @@ def _construct_tekton_trigger_resource(
     saas_file_name: str,
     env_name: str,
     tkn_pipeline_name: str,
-    timeout: Optional[str],
+    timeout: str | None,
     tkn_cluster_console_url: str,
     tkn_namespace_name: str,
     integration: str,
     integration_version: str,
     include_trigger_trace: bool,
-    reason: Optional[str],
+    reason: str | None,
 ) -> tuple[OR, str]:
     """Construct a resource (PipelineRun) to trigger a deployment via Tekton.
 

reconcile/openshift_saas_deploy_trigger_cleaner.py

@@ -1,14 +1,11 @@
 import logging
 from collections.abc import Callable
 from datetime import (
+    UTC,
     datetime,
     timedelta,
-    timezone,
-)
-from typing import (
-    Any,
-    Optional,
 )
+from typing import Any
 
 from dateutil import parser
 
@@ -67,11 +64,11 @@ def get_pipeline_runs_to_delete(
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
-    now_date = datetime.now(timezone.utc)
+    now_date = datetime.now(UTC)
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     pipeline_providers = get_tekton_pipeline_providers()

reconcile/openshift_saas_deploy_trigger_configs.py

@@ -1,5 +1,4 @@
 import sys
-from typing import Optional
 
 import reconcile.openshift_saas_deploy_trigger_base as osdt_base
 from reconcile.status import ExitCodes
@@ -13,7 +12,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 3, 0)
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     include_trigger_trace: bool = False,
 ) -> None:

reconcile/openshift_saas_deploy_trigger_images.py

@@ -1,5 +1,4 @@
 import sys
-from typing import Optional
 
 import reconcile.openshift_saas_deploy_trigger_base as osdt_base
 from reconcile.status import ExitCodes
@@ -13,7 +12,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     include_trigger_trace: bool = False,
 ) -> None:

reconcile/openshift_saas_deploy_trigger_moving_commits.py

@@ -1,5 +1,4 @@
 import sys
-from typing import Optional
 
 import reconcile.openshift_saas_deploy_trigger_base as osdt_base
 from reconcile.status import ExitCodes
@@ -13,7 +12,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 3, 0)
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     include_trigger_trace: bool = False,
 ) -> None:

reconcile/openshift_saas_deploy_trigger_upstream_jobs.py

@@ -1,5 +1,4 @@
 import sys
-from typing import Optional
 
 import reconcile.openshift_saas_deploy_trigger_base as osdt_base
 from reconcile.status import ExitCodes
@@ -13,7 +12,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 3, 0)
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     include_trigger_trace: bool = False,
 ) -> None:

reconcile/openshift_tekton_resources.py

@@ -2,11 +2,7 @@ import json
 import logging
 import sys
 from collections.abc import Mapping
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 import jinja2
 import yaml
@@ -77,7 +73,7 @@ class OpenshiftTektonResourcesBadConfigError(Exception):
     pass
 
 
-def fetch_saas_files(saas_file_name: Optional[str]) -> list[dict[str, Any]]:
+def fetch_saas_files(saas_file_name: str | None) -> list[dict[str, Any]]:
     """Fetch saas v2 files"""
     saas_files = gql.get_api().query(SAAS_FILES_QUERY)["saas_files"]
 
@@ -93,7 +89,7 @@ def fetch_saas_files(saas_file_name: Optional[str]) -> list[dict[str, Any]]:
     return saas_files
 
 
-def fetch_tkn_providers(saas_file_name: Optional[str]) -> dict[str, Any]:
+def fetch_tkn_providers(saas_file_name: str | None) -> dict[str, Any]:
     """Fetch tekton providers data for the saas files handled here"""
     saas_files = fetch_saas_files(saas_file_name)
     if not saas_files:
@@ -138,7 +134,7 @@ def fetch_tkn_providers(saas_file_name: Optional[str]) -> dict[str, Any]:
 
 def fetch_desired_resources(
     tkn_providers: dict[str, Any],
-) -> list[dict[str, Union[str, OR]]]:
+) -> list[dict[str, str | OR]]:
     """Create an array of dicts that will be used as args of ri.add_desired
     This will also add resourceNames inside tkn_providers['namespace']
     while we are migrating from the current system to this integration"""
@@ -344,7 +340,7 @@ def load_tkn_template(path: str, variables: dict[str, str]) -> dict[str, Any]:
 
 def build_desired_resource(
     tkn_object: dict[str, Any], path: str, cluster: str, namespace: str
-) -> dict[str, Union[str, OR]]:
+) -> dict[str, str | OR]:
     """Returns a dict with ResourceInventory.add_desired args"""
     openshift_resource = OR(
         tkn_object,
@@ -424,9 +420,9 @@ def build_one_per_saas_file_tkn_task_name(
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    saas_file_name: Optional[str] = None,
+    saas_file_name: str | None = None,
 ) -> None:
     tkn_providers = fetch_tkn_providers(saas_file_name)
 

reconcile/openshift_upgrade_watcher.py

@@ -4,7 +4,6 @@ from collections.abc import (
     Iterable,
 )
 from datetime import datetime
-from typing import Optional
 
 from reconcile import queries
 from reconcile.gql_definitions.common.clusters import ClusterV1
@@ -32,7 +31,7 @@ from reconcile.utils.state import (
 QONTRACT_INTEGRATION = "openshift-upgrade-watcher"
 
 
-def cluster_slack_handle(cluster: str, slack: Optional[SlackApi]) -> str:
+def cluster_slack_handle(cluster: str, slack: SlackApi | None) -> str:
     usergroup = f"{cluster}-cluster"
     usergroup_id = f"@{usergroup}"
     if slack:
@@ -42,10 +41,10 @@ def cluster_slack_handle(cluster: str, slack: Optional[SlackApi]) -> str:
 
 def handle_slack_notification(
     msg: str,
-    slack: Optional[SlackApi],
+    slack: SlackApi | None,
     state: State,
     state_key: str,
-    state_value: Optional[str],
+    state_value: str | None,
 ) -> None:
     """Check notification status, notify if needed and update the notification status"""
     if state.exists(state_key) and state.get(state_key) == state_value:
@@ -58,9 +57,7 @@ def handle_slack_notification(
     state.add(state_key, state_value, force=True)
 
 
-def _get_start_osd(
-    oc_map: OCMap, cluster_name: str
-) -> tuple[Optional[str], Optional[str]]:
+def _get_start_osd(oc_map: OCMap, cluster_name: str) -> tuple[str | None, str | None]:
     oc = oc_map.get(cluster_name)
     if isinstance(oc, OCLogMsg):
         logging.log(level=oc.log_level, msg=oc.message)
@@ -84,7 +81,7 @@ def _get_start_osd(
 
 def _get_start_hypershift(
     ocm_api: OCMBaseClient, cluster_id: str
-) -> tuple[Optional[str], Optional[str]]:
+) -> tuple[str | None, str | None]:
     schedules = get_control_plane_upgrade_policies(ocm_api, cluster_id)
     schedule = [s for s in schedules if s["state"] == "started"]
     if not schedule:
@@ -101,7 +98,7 @@ def notify_upgrades_start(
     oc_map: OCMap,
     ocm_map: OCMMap,
     state: State,
-    slack: Optional[SlackApi],
+    slack: SlackApi | None,
 ) -> None:
     now = datetime.utcnow()
     for cluster in clusters:
@@ -135,7 +132,7 @@ def notify_upgrades_start(
 
 
 def notify_cluster_new_version(
-    clusters: Iterable[ClusterV1], state: State, slack: Optional[SlackApi]
+    clusters: Iterable[ClusterV1], state: State, slack: SlackApi | None
 ) -> None:
     # Send a notification, if a cluster runs a version it was not running in the past
     # This does not check if an upgrade was successful or not
@@ -159,11 +156,11 @@ def notify_cluster_new_version(
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
-    slack: Optional[SlackApi] = None
+    slack: SlackApi | None = None
     if not dry_run:
         slack = slackapi_from_queries(QONTRACT_INTEGRATION)