qontract-reconcile 0.10.2.dev415__tar.gz → 0.10.2.dev417__tar.gz

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev415
+Version: 0.10.2.dev417
 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
@@ -31,7 +31,7 @@ Requires-Dist: jsonpatch~=1.33
 Requires-Dist: jsonpath-ng==1.7.0
 Requires-Dist: jsonpath-rw<1.5.0,>=1.4.0
 Requires-Dist: jsonpointer~=2.4
-Requires-Dist: kubernetes~=24.0
+Requires-Dist: kubernetes==32.0.1
 Requires-Dist: ldap3<2.10.0,>=2.9.1
 Requires-Dist: markupsafe==2.1.1
 Requires-Dist: networkx~=2.8

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
     "jsonpath-ng==1.7.0",
     "jsonpath-rw>=1.4.0,<1.5.0",
     "jsonpointer~=2.4",
-    "kubernetes~=24.0",
+    "kubernetes==32.0.1",
     "ldap3>=2.9.1,<2.10.0",
     "MarkupSafe==2.1.1",
     "networkx~=2.8",
@@ -75,7 +75,6 @@ dev = [
     "anymarkup ~=0.8.1",
     # keep in sync project.dependencies.boto3
     "boto3-stubs[account,cloudformation,dynamodb,ec2,ecr,elb,iam,logs,organizations,rds,route53,s3,service-quotas,sqs,sts,support]==1.34.94",
-    "kubernetes-stubs==22.6.0",
     "MarkupSafe ~=2.1.1",
     "moto[ec2,iam,logs,s3,route53] ~=5.1",
     "mypy ~=1.17.0",

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/automated_actions/config/integration.py

@@ -7,7 +7,7 @@ from collections.abc import (
 from typing import Any
 
 import yaml
-from kubernetes.client import (  # type: ignore[attr-defined]
+from kubernetes.client import (
     ApiClient,
     V1ConfigMap,
     V1ObjectMeta,

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/cli.py

@@ -50,8 +50,8 @@ from reconcile.utils.unleash import get_feature_toggle_state
 TERRAFORM_VERSION = ["1.6.6"]
 TERRAFORM_VERSION_REGEX = r"^Terraform\sv([\d]+\.[\d]+\.[\d]+)$"
 
-OC_VERSIONS = ["4.16.2", "4.12.46", "4.10.15"]
-OC_VERSION_REGEX = r"^Client\sVersion:\s([\d]+\.[\d]+\.[\d]+)$"
+OC_VERSIONS = ["4.19.0", "4.16.2"]
+OC_VERSION_REGEX = r"^Client\sVersion:\s([\d]+\.[\d]+\.[\d]+)"
 
 HELM_VERSIONS = ["3.11.1"]
 HELM_VERSION_REGEX = r"^version.BuildInfo{Version:\"v([\d]+\.[\d]+\.[\d]+)\".*$"

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/rhidp/sso_client/base.py

@@ -1,3 +1,4 @@
+import http
 import logging
 from collections.abc import (
     Iterable,
@@ -10,6 +11,7 @@ from urllib.parse import (
 )
 
 import jwt
+from requests import HTTPError
 
 from reconcile.rhidp.common import (
     Cluster,
@@ -256,9 +258,18 @@ def delete_sso_client(
     )
     sso_client = SSOClient(**secret_reader.read_all_secret(secret=secret))
     keycloak_api = keycloak_map.get(sso_client.issuer)
-    keycloak_api.delete_client(
-        registration_client_uri=sso_client.registration_client_uri,
-        registration_access_token=sso_client.registration_access_token,
-    )
+    try:
+        keycloak_api.delete_client(
+            registration_client_uri=sso_client.registration_client_uri,
+            registration_access_token=sso_client.registration_access_token,
+        )
+    except HTTPError as e:
+        if e.response.status_code != http.HTTPStatus.UNAUTHORIZED:
+            logging.error(f"Failed to delete SSO client {sso_client_id}: {e}")
+            raise
+        # something went wrong with the registration token, maybe it expired
+        logging.error(
+            f"Failed to delete SSO client {sso_client_id} due to unauthorized error: {e}. Continuing to delete the vault secret."
+        )
 
     secret_reader.vault_client.delete(path=secret.path)

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/utils/binary.py

@@ -38,10 +38,7 @@ def binary_version(
     def deco_binary_version(f: Callable) -> Callable:
         @wraps(f)
         def f_binary_version(*args: Any, **kwargs: Any) -> None:
-            regex = re.compile(search_regex)
-
-            cmd = [binary]
-            cmd.extend(version_args)
+            cmd = [binary, *version_args]
             try:
                 result = subprocess.run(cmd, capture_output=True, check=True)
             except subprocess.CalledProcessError as e:
@@ -50,15 +47,13 @@ def binary_version(
                 )
                 raise Exception(msg) from e
 
-            found = False
-            match = None
-            for line in result.stdout.splitlines():
-                match = regex.search(line.decode("utf-8"))
-                if match is not None:
-                    found = True
-                    break
+            match = re.search(
+                search_regex,
+                result.stdout.decode("utf-8"),
+                re.MULTILINE,
+            )
 
-            if not found or not match:
+            if match is None:
                 raise Exception(
                     f"Could not find version for binary '{binary}' via regex "
                     f"for binary version check: "

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/utils/jobcontroller/controller.py

@@ -3,7 +3,7 @@ import time
 from datetime import datetime
 from typing import Protocol, TextIO
 
-from kubernetes.client import (  # type: ignore[attr-defined]
+from kubernetes.client import (
     ApiClient,
     V1Job,
     V1ObjectMeta,

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/utils/oc.py

@@ -18,7 +18,7 @@ from threading import Lock
 from typing import TYPE_CHECKING, Any, TextIO, cast
 
 import urllib3
-from kubernetes.client import (  # type: ignore[attr-defined]
+from kubernetes.client import (
     ApiClient,
     Configuration,
 )

{qontract_reconcile-0.10.2.dev415 → qontract_reconcile-0.10.2.dev417}/reconcile/utils/saasherder/saasherder.py

@@ -92,8 +92,7 @@ from reconcile.utils.state import State
 from reconcile.utils.vcs import VCS
 
 TARGET_CONFIG_HASH = "target_config_hash"
-
-
+TEMPLATE_API_VERSION = "template.openshift.io/v1"
 UNIQUE_SAAS_FILE_ENV_COMBO_LEN = 56
 REQUEST_TIMEOUT = 60
 
@@ -871,10 +870,23 @@ class SaasHerder:
         """
         if parameter_name in consolidated_parameters:
             return False
-        for template_parameter in template.get("parameters", {}):
-            if template_parameter["name"] == parameter_name:
-                return True
-        return False
+        return any(
+            template_parameter["name"] == parameter_name
+            for template_parameter in template.get("parameters") or []
+        )
+
+    @staticmethod
+    def _pre_process_template(template: dict[str, Any]) -> dict[str, Any]:
+        """
+        The only supported apiVersion for OpenShift Template is "template.openshift.io/v1".
+        There are examples of templates using "v1", it can't pass validation on 4.19+ oc versions.
+
+        Args:
+            template (dict): The OpenShift template dictionary.
+        Returns:
+            dict: The OpenShift template dictionary with the correct apiVersion.
+        """
+        return template | {"apiVersion": TEMPLATE_API_VERSION}
 
     def _process_template(
         self, spec: TargetSpec
@@ -964,7 +976,8 @@ class SaasHerder:
             oc = OCLocal("cluster", None, None, local=True)
             try:
                 resources: Iterable[Mapping[str, Any]] = oc.process(
-                    template, consolidated_parameters
+                    template=self._pre_process_template(template),
+                    parameters=consolidated_parameters,
                 )
             except StatusCodeError as e:
                 logging.error(f"{error_prefix} error processing template: {e!s}")