qontract-reconcile 0.10.2.dev208__py3-none-any.whl → 0.10.2.dev213__py3-none-any.whl

{qontract_reconcile-0.10.2.dev208.dist-info → qontract_reconcile-0.10.2.dev213.dist-info}/METADATA

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

@@ -71,7 +71,7 @@ reconcile/openshift_network_policies.py,sha256=p81ShFK1WSEGiWHVURopDpg8YvtA3RE3O
 reconcile/openshift_prometheus_rules.py,sha256=onowXab248zmHH8SbYDTc1W1bl7JiqRFU1xdTkZyLFg,1332
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLyqF4,1518
-reconcile/openshift_resources_base.py,sha256=3HudPdM7EE0HNWUn1eu0O20Ij25fqGisaDBMVvTk1fk,41768
+reconcile/openshift_resources_base.py,sha256=fogdGOnAk-8xK7z9UeLs1rT2IwDs6Q7jSx_iOVAWDLk,42316
 reconcile/openshift_rhcs_certs.py,sha256=lP0GwKMRl8YBzxrwdbBOxrPqIPYNmu2KkZPGzWKyRVU,9859
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
@@ -767,9 +767,9 @@ reconcile/utils/runtime/meta.py,sha256=dWdKS9eHVuowFkTK4lgXJ723vS1y9giOMzePUKnHn
 reconcile/utils/runtime/runner.py,sha256=I30KRrX1UQbHc_Ir1cIZX3OfNSdoHKdnDSPAEB69Ilk,7944
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
-reconcile/utils/saasherder/interfaces.py,sha256=NEYQspYfyWQhBeJyNCqSFbixi1A4wRVGB7FeNM5BDCk,9141
-reconcile/utils/saasherder/models.py,sha256=JaOz_DEtudJZhiDe90kaBlJkppFufn81V92oK9PHYx0,10208
-reconcile/utils/saasherder/saasherder.py,sha256=uQovEpcnZXpJlG_tBUY0X1v5obYMH55vc5cSvi3eZjU,86862
+reconcile/utils/saasherder/interfaces.py,sha256=nbGVLiIXJvOtd5ZfKsP3bfrFbMpdQ02D0cTTM9rrED0,9286
+reconcile/utils/saasherder/models.py,sha256=MSKaC65_bXSxKvhCibRH5K1DNppLPbw5w7_6VrjCCFU,11018
+reconcile/utils/saasherder/saasherder.py,sha256=W9nmQyULr4Jx9VAMwFyhULbKo5WRP9nSieOnpO5UxKQ,90224
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -815,7 +815,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev208.dist-info/METADATA,sha256=aHM0xspqvI1keKkT4Wm4ydHb1j9QL-QknaweeU7D6L0,24555
-qontract_reconcile-0.10.2.dev208.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev208.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev208.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev213.dist-info/METADATA,sha256=KF0B_KMRSL7FeDdMZr1P7osgPw5qyZm10v6Pe90T4oA,24555
+qontract_reconcile-0.10.2.dev213.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev213.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev213.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -667,6 +667,15 @@ def fetch_current_state(
         openshift_resource = OR(
             item, QONTRACT_INTEGRATION, QONTRACT_INTEGRATION_VERSION
         )
+        labels = openshift_resource.body.get("metadata", {}).get("labels", {})
+        # Skip resources managed by ArgoCD
+        # This uses the Kubernetes recommended label 'app.kubernetes.io/part-of=argocd'
+        # https://argo-cd.readthedocs.io/en/stable/user-guide/resource_tracking/
+        if labels.get("app.kubernetes.io/part-of") == "argocd":
+            _locked_info_log(
+                f"Skipping {openshift_resource.kind} {openshift_resource.name} in current state because it is managed by ArgoCD"
+            )
+            continue
         ri.add_current(
             cluster,
             namespace,
@@ -698,7 +707,6 @@ def fetch_desired_state(
         msg = f"[{cluster}/{namespace}] {e!s}"
         _locked_error_log(msg)
         return
-
     # add to inventory
     try:
         ri.add_desired_resource(

reconcile/utils/saasherder/interfaces.py

@@ -7,6 +7,7 @@ from typing import (
     runtime_checkable,
 )
 
+from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 from reconcile.utils import oc_connection_parameters
 from reconcile.utils.secret_reader import HasSecret
 
@@ -326,6 +327,9 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
     @property
     def images(self) -> Sequence[SaasResourceTemplateTargetImage] | None: ...
 
+    @property
+    def slos(self) -> list[SLODocument] | None: ...
+
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
     ) -> str: ...

reconcile/utils/saasherder/models.py

@@ -12,6 +12,9 @@ from pydantic import (
     Field,
 )
 
+from reconcile.gql_definitions.fragments.saas_slo_document import (
+    SLODocument,
+)
 from reconcile.utils.oc_connection_parameters import Cluster
 from reconcile.utils.saasherder.interfaces import (
     HasParameters,
@@ -66,8 +69,18 @@ class TriggerSpecBase:
         raise NotImplementedError("implement this function in inheriting classes")
 
 
+@dataclass(frozen=True)
+class SLOKey:
+    slo_document_name: str
+    namespace_name: str
+    cluster_name: str
+
+
 @dataclass
 class TriggerSpecConfig(TriggerSpecBase):
+    resource_template_url: str
+    target_ref: str
+    slos: list[SLODocument] | None = None
     target_name: str | None = None
     reason: str | None = None
 
@@ -81,6 +94,19 @@ class TriggerSpecConfig(TriggerSpecBase):
             key += f"/{self.target_name}"
         return key
 
+    def extract_slo_keys(self) -> list[SLOKey]:
+        return [
+            SLOKey(
+                slo_document_name=slo_document.name,
+                namespace_name=namespace.namespace.name,
+                cluster_name=namespace.namespace.cluster.name,
+            )
+            for slo_document in self.slos or []
+            for namespace in slo_document.namespaces
+            if namespace.namespace.name == self.namespace_name
+            and namespace.namespace.cluster.name == self.cluster_name
+        ]
+
 
 @dataclass
 class TriggerSpecMovingCommit(TriggerSpecBase):

reconcile/utils/saasherder/saasherder.py

@@ -71,6 +71,7 @@ from reconcile.utils.saasherder.models import (
     ImageAuth,
     Namespace,
     Promotion,
+    SLOKey,
     TargetSpec,
     TriggerSpecConfig,
     TriggerSpecContainerImage,
@@ -81,6 +82,7 @@ from reconcile.utils.saasherder.models import (
     UpstreamJob,
 )
 from reconcile.utils.secret_reader import SecretReaderBase
+from reconcile.utils.slo_document_manager import SLODetails, SLODocumentManager
 from reconcile.utils.state import State
 from reconcile.utils.vcs import VCS
 
@@ -1040,19 +1042,19 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return channel_map
 
     def _collect_blocked_versions(self) -> dict[str, set[str]]:
-        blocked_versions: dict[str, set[str]] = {}
+        blocked_versions: dict[str, set[str]] = defaultdict(set[str])
         for saas_file in self.saas_files:
             for cc in saas_file.app.code_components or []:
                 for v in cc.blocked_versions or []:
-                    blocked_versions.setdefault(cc.url, set()).add(v)
+                    blocked_versions[cc.url].add(v)
         return blocked_versions
 
     def _collect_hotfix_versions(self) -> dict[str, set[str]]:
-        hotfix_versions: dict[str, set[str]] = {}
+        hotfix_versions: dict[str, set[str]] = defaultdict(set[str])
         for saas_file in self.saas_files:
             for cc in saas_file.app.code_components or []:
                 for v in cc.hotfix_versions or []:
-                    hotfix_versions.setdefault(cc.url, set()).add(v)
+                    hotfix_versions[cc.url].add(v)
         return hotfix_versions
 
     @staticmethod
@@ -1273,6 +1275,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     cluster_name=target.namespace.cluster.name,
                     namespace_name=target.namespace.name,
                     target_name=target.name,
+                    resource_template_url=rt.url,
+                    target_ref=target.ref,
                     state_content=None,
                 ).state_key
                 digest = SaasHerder.get_target_config_hash(
@@ -1691,7 +1695,82 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         results = threaded.run(
             self.get_configs_diff_saas_file, self.saas_files, self.thread_pool_size
         )
-        return list(itertools.chain.from_iterable(results))
+        trigger_config_spec_list = list(itertools.chain.from_iterable(results))
+        return self.filter_slo_breached_triggers(trigger_config_spec_list)
+
+    def filter_slo_breached_triggers(
+        self, trigger_config_spec_list: list[TriggerSpecConfig]
+    ) -> list[TriggerSpecConfig]:
+        trigger_config_specs_to_validate: list[TriggerSpecConfig] = [
+            trigger_config_spec
+            for trigger_config_spec in trigger_config_spec_list
+            if trigger_config_spec.slos
+            and trigger_config_spec.target_ref
+            not in self.hotfix_versions[trigger_config_spec.resource_template_url]
+        ]
+        if not trigger_config_specs_to_validate:
+            return trigger_config_spec_list
+
+        slo_documents = [
+            slo
+            for trigger_spec in trigger_config_specs_to_validate
+            for slo in trigger_spec.slos or []
+        ]
+        slo_document_manager = SLODocumentManager(
+            slo_documents=slo_documents,
+            thread_pool_size=self.thread_pool_size,
+            secret_reader=self.secret_reader,
+        )
+        breached_slos = slo_document_manager.get_breached_slos()
+        if not breached_slos:
+            return trigger_config_spec_list
+
+        breached_slos_map = self.make_breached_slos_map(breached_slos)
+        valid_trigger_config_specs = [
+            trigger_config_spec
+            for trigger_config_spec in trigger_config_spec_list
+            if not self.has_breached_slos(trigger_config_spec, breached_slos_map)
+        ]
+        return valid_trigger_config_specs
+
+    @staticmethod
+    def make_breached_slos_map(
+        breached_slos: list[SLODetails],
+    ) -> dict[SLOKey, list[SLODetails]]:
+        breached_slos_map: dict[SLOKey, list[SLODetails]] = defaultdict(
+            list[SLODetails]
+        )
+        for breached_slo in breached_slos:
+            breached_slos_map[
+                SLOKey(
+                    slo_document_name=breached_slo.slo_document_name,
+                    namespace_name=breached_slo.namespace_name,
+                    cluster_name=breached_slo.cluster_name,
+                )
+            ].append(breached_slo)
+        return breached_slos_map
+
+    @staticmethod
+    def has_breached_slos(
+        trigger_spec: TriggerSpecConfig,
+        breached_slo_map: dict[SLOKey, list[SLODetails]],
+    ) -> bool:
+        matching_slo_keys = [
+            slo_key
+            for slo_key in trigger_spec.extract_slo_keys()
+            if slo_key in breached_slo_map
+        ]
+        if not matching_slo_keys:
+            return False
+        logging.info(
+            f"Skipping target from saas file {trigger_spec.saas_file_name} due to following breached SLOs."
+        )
+        for matching_key in matching_slo_keys:
+            for breached_slo in breached_slo_map[matching_key]:
+                logging.info(
+                    f"SLO: {breached_slo.slo.name} of document {breached_slo.slo_document_name} is breached. Current value: {breached_slo.current_slo_value} Expected: {breached_slo.slo.slo_target}"
+                )
+        return True
 
     @staticmethod
     def remove_none_values(d: dict[Any, Any] | None) -> dict[Any, Any]:
@@ -1725,7 +1804,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             dtc = SaasHerder.remove_none_values(trigger_spec.state_content)
             if ctc == dtc:
                 continue
-
             if self.include_trigger_trace:
                 trigger_spec.reason = f"{self.repo_url}/commit/{RunningState().commit}"
                 # For now we count every saas config change as an auto-promotion
@@ -1820,6 +1898,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     namespace_name=target.namespace.name,
                     target_name=target.name,
                     state_content=serializable_target_config,
+                    resource_template_url=rt.url,
+                    target_ref=target.ref,
+                    slos=target.slos or None,
                 )
                 configs[trigger_spec.state_key] = trigger_spec