qontract-reconcile 0.10.2.dev405__py3-none-any.whl → 0.10.2.dev406__py3-none-any.whl

{qontract_reconcile-0.10.2.dev405.dist-info → qontract_reconcile-0.10.2.dev406.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev405
+Version: 0.10.2.dev406
 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.dev405.dist-info → qontract_reconcile-0.10.2.dev406.dist-info}/RECORD

@@ -54,7 +54,7 @@ reconcile/ocm_groups.py,sha256=gDnkhkYUEoMkI6y6ctyoKIFpJNS18SVnedW4OzJ8VWs,4174
 reconcile/ocm_machine_pools.py,sha256=KnTYAOw25N-QRb3Y7zbNY8w8xCR55WyqVjycYz24Yxk,17243
 reconcile/ocm_update_recommended_version.py,sha256=Vi3Y2sX-OQxx1mv_xiPQXnmrpsZzGIE38No0yBcTaD4,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=j4qthqx8qREB6mSbV9NT-Giq1Tu5y2EhPgIObkvmjyU,4371
-reconcile/openshift_base.py,sha256=m-w8VXmph1ngdiFcb_LpRqfx_XrocIrmtukz4VmFE24,55042
+reconcile/openshift_base.py,sha256=TTw6da2Efyy5CMxh18CUCtuZgToMnbtszBosflLDkUs,55989
 reconcile/openshift_cluster_bots.py,sha256=POs2kBwKjzD--lElGDQbF7HOuCcOpMEclw4a9usntos,10933
 reconcile/openshift_clusterrolebindings.py,sha256=jwSaYQvUUY7noQGc148Dkqm6woYxvOEd1sume7k_sUk,6212
 reconcile/openshift_groups.py,sha256=XpIyhgnWY1XUQio1wi6sHoDtoMYdk-lpHp0-1d1RC7o,9471
@@ -628,12 +628,12 @@ reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=kiOoWO0b0mO-MDZWxyClYz9SeohQ0QU-xji0p-cSiLo,18462
 reconcile/utils/models.py,sha256=N-cOLsLbZAzVazFImue4d1pllCGd_vVcIrFKykYZXZo,4682
 reconcile/utils/oauth2_backend_application_session.py,sha256=6W16sMpnWEPFDUX7qi5Cui2yOnmLfpgUxWtB3Ii35D0,4177
-reconcile/utils/oc.py,sha256=ThVUVPEk7b25SPryPau0Ly1ozsX_-fp6MeeSJxQzmQI,69355
+reconcile/utils/oc.py,sha256=tk1En7ShB-ny0vKL2tTPvVBHMMZcfdRS4JkTwkZ6mYU,69639
 reconcile/utils/oc_connection_parameters.py,sha256=-H2crz0UOVKWlNrexf04ip8Vu57rE2QZLJuurvin1_c,9705
 reconcile/utils/oc_filters.py,sha256=DXIA2--jlYadPGsKynnnXW_LIZra6N2wmD0MVngir5Y,1427
 reconcile/utils/oc_map.py,sha256=ougQ-Wlsa8ymoE_lPQ7g2LlpsUOsHVeRCLYW_6fjeWU,8976
 reconcile/utils/ocm_base_client.py,sha256=niBN-yHiML5ljqKMOabFTaYW9iQ8JAway37BQF2NvtM,6713
-reconcile/utils/openshift_resource.py,sha256=B_2yg85b93F07k6wIHQputFymC2ysl-nzvu4o0cfKAw,26027
+reconcile/utils/openshift_resource.py,sha256=XTFLkaWOjNbkOD5XmCwMGdc9gKbgtKg819pWNcQVfpc,26189
 reconcile/utils/openssl.py,sha256=qdEdSmNXDgx_hhj2psEea6O12cmn3pb4GNhQJtI5l_E,399
 reconcile/utils/output.py,sha256=Rcz9BWaUDLlEWov5NSUSVy5ucx2WKeKNlUddrDjIQtk,2242
 reconcile/utils/pagerduty_api.py,sha256=kPMdegdnb9muL4PttbMVlOAbxMHltMPFLiUyQu6S7wo,7641
@@ -800,7 +800,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev405.dist-info/METADATA,sha256=eH-WJsCyUi-2jX12Didk4LiLJaaQ7VKVZOOoFN_b4n4,24946
-qontract_reconcile-0.10.2.dev405.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev405.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev405.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev406.dist-info/METADATA,sha256=FWPHfQFsB0Ne8mEHAmD6ndESIZmPM78am7UxYl5MkBc,24946
+qontract_reconcile-0.10.2.dev406.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev406.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev406.dist-info/RECORD,,

reconcile/openshift_base.py

@@ -30,9 +30,11 @@ from reconcile.utils import (
 )
 from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
 from reconcile.utils.oc import (
+    AmbiguousResourceTypeError,
     DeploymentFieldIsImmutableError,
     FieldIsImmutableError,
     InvalidValueApplyError,
+    KindNotFoundError,
     MayNotChangeOnceSetError,
     MetaDataAnnotationsTooLongApplyError,
     OC_Map,
@@ -188,6 +190,24 @@ def init_specs_to_fetch(
                 continue
 
             managed_resource_names = namespace_info.get("managedResourceNames") or []
+            try:
+                validate_managed_resource_types(
+                    oc,
+                    managed_types,
+                    managed_resource_names,
+                    cluster_scope_resource_validation=cluster_scope_resource_validation,
+                )
+            except KindNotFoundError:
+                # We must allow kinds that are not supported by the cluster because:
+                # 1. We install CRD with an operator in the same MR
+                # 2. SAAS files initialize the namespace objects with managedResourceTypes from the SAAS file
+                #    and we can't expect that all of those are valid for all clusters
+                pass
+            except (AmbiguousResourceTypeError, ValidationError) as e:
+                ri.register_error()
+                logging.error(f"[{cluster}/{namespace_info['name']}] {e}")
+                continue
+
             namespace = namespace_info["name"]
             # These may exit but have a value of None
             managed_resource_type_overrides = (

reconcile/utils/oc.py

@@ -146,6 +146,14 @@ class RequestEntityTooLargeError(Exception):
     pass
 
 
+class KindNotFoundError(Exception):
+    pass
+
+
+class AmbiguousResourceTypeError(Exception):
+    pass
+
+
 class OCDecorators:
     @classmethod
     def process_reconcile_time(cls, function: Callable) -> Callable:
@@ -1232,7 +1240,7 @@ class OCCli:
         try:
             self.get_api_resource(kind)
             return True
-        except RuntimeError:
+        except KindNotFoundError:
             return False
 
     def is_kind_namespaced(self, kind: str) -> bool:
@@ -1253,25 +1261,26 @@ class OCCli:
         kind, group, _ = self.parse_kind(kind)
 
         if not (resources := self.api_resources.get(kind)):
-            raise RuntimeError(f"Unsupported resource type: {kind}")
+            # the kind not found at all
+            raise KindNotFoundError(f"Unsupported resource type: {kind}")
 
         if len(resources) == 1 and group == DEFAULT_GROUP:
             return resources[0]
 
-        resource = next(
-            (r for r in resources if r.group == group),
-            None,
-        )
-        if resource is None:
+        # get the resource with the specified group
+        if resource := next((r for r in resources if r.group == group), None):
+            return resource
+
+        # no resource with the specified group found
+        if group == DEFAULT_GROUP:
             message = (
                 f"Ambiguous resource type: {kind}. "
                 "Please fully qualify it with its API group. E.g., ClusterRoleBinding -> ClusterRoleBinding.rbac.authorization.k8s.io"
-                if group == DEFAULT_GROUP
-                else f"Unsupported resource type: {kind}"
             )
-            raise RuntimeError(message)
+            raise AmbiguousResourceTypeError(message)
 
-        return resource
+        # group was specified but no matching resource found
+        raise KindNotFoundError(f"Unsupported resource type: {kind}")
 
 
 REQUEST_TIMEOUT = 60

reconcile/utils/openshift_resource.py

@@ -5,6 +5,7 @@ import base64
 import contextlib
 import copy
 import hashlib
+import logging
 import re
 from threading import Lock
 from typing import TYPE_CHECKING, Any
@@ -601,6 +602,10 @@ class ResourceInventory:
         resource: OpenshiftResource,
         privileged: bool = False,
     ) -> None:
+        if cluster not in self._clusters:
+            logging.error(f"Cluster {cluster} not initialized in ResourceInventory")
+            return
+
         if resource.kind_and_group in self._clusters[cluster][namespace]:
             kind = resource.kind_and_group
         else: