qontract-reconcile 0.10.2.dev86__py3-none-any.whl → 0.10.2.dev87__py3-none-any.whl

{qontract_reconcile-0.10.2.dev86.dist-info → qontract_reconcile-0.10.2.dev87.dist-info}/METADATA

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

@@ -199,10 +199,10 @@ reconcile/external_resources/aws.py,sha256=wzN3GHxyqVa4Lqqg5HdogqNW2RM532t0ZiKaQ
 reconcile/external_resources/factories.py,sha256=C0QHT0soEv6z99-ELAAE19S5MaMHhV0t1fSiQn0Coc4,5970
 reconcile/external_resources/integration.py,sha256=JF38M7R0Z4ADUTx57TZqSZH9k_xpPlbAxQAcGyIISuM,6925
 reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYYfiki10orNjOGVma-XojhVqd0ww4,1667
-reconcile/external_resources/manager.py,sha256=ZagwLn6YQ1XmgmMN3qpuDzQsQxa4VOYl-IQPZBwCDqM,17103
+reconcile/external_resources/manager.py,sha256=mvFfcXPzvNqDWDgKTK8eiSe6C_FUvBtben3bSqrqSoc,18246
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
-reconcile/external_resources/model.py,sha256=dxwiyI3J9xyLeue8_W9NJoap-CkKLMAoY0S0ml5-NbU,13450
+reconcile/external_resources/model.py,sha256=HrSkmAjOqw0aT3CsZKXKMLyocM__8XO5qHb-dXcoagw,13747
 reconcile/external_resources/reconciler.py,sha256=-0trp1K-iUgOQn3mm1ZUSmfaReRrUT0eHzPkUhNPolQ,9583
 reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
@@ -786,7 +786,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.dev86.dist-info/METADATA,sha256=cajktJ7yRKHgFkrRRzNfruYA4M_gcRFOEF9RO_MH01w,24565
-qontract_reconcile-0.10.2.dev86.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev86.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev86.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev87.dist-info/METADATA,sha256=nVRpZDkDyzcxrgE5yIHcfaAKhAQBbpzHtq_p3vStPr8,24565
+qontract_reconcile-0.10.2.dev87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev87.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev87.dist-info/RECORD,,

reconcile/external_resources/manager.py

@@ -133,6 +133,40 @@ class ExternalResourcesManager:
         self.thread_pool_size = thread_pool_size
         self.dry_runs_validator = dry_runs_validator
 
+    def _resource_spec_changed(
+        self, reconciliation: Reconciliation, state: ExternalResourceState
+    ) -> bool:
+        return reconciliation.resource_hash != state.reconciliation.resource_hash
+
+    def _resource_drift_detection_ttl_expired(
+        self, reconciliation: Reconciliation, state: ExternalResourceState
+    ) -> bool:
+        return (datetime.now(state.ts.tzinfo) - state.ts).total_seconds() > (
+            reconciliation.module_configuration.reconcile_drift_interval_minutes * 60
+        )
+
+    def _reconciliation_module_config_overridden(
+        self, reconciliation: Reconciliation, state: ExternalResourceState
+    ) -> bool:
+        return reconciliation.module_configuration.overridden and (
+            reconciliation.module_configuration.image_version
+            != state.reconciliation.module_configuration.image_version
+        )
+
+    def _reconciliation_needs_dry_run_run(
+        self, reconciliation: Reconciliation, state: ExternalResourceState
+    ) -> bool:
+        return (
+            reconciliation.action == Action.APPLY
+            and (
+                self._resource_spec_changed(reconciliation, state)
+                or self._reconciliation_module_config_overridden(reconciliation, state)
+            )
+        ) or (
+            reconciliation.action == Action.DESTROY
+            and not state.resource_status.is_in_progress
+        )
+
     def _get_reconcile_action(
         self, reconciliation: Reconciliation, state: ExternalResourceState
     ) -> ReconcileAction:
@@ -145,17 +179,16 @@ class ExternalResourcesManager:
                 case ResourceStatus.ERROR:
                     return ReconcileAction.APPLY_ERROR
                 case ResourceStatus.CREATED | ResourceStatus.PENDING_SECRET_SYNC:
-                    if (
-                        reconciliation.resource_hash
-                        != state.reconciliation.resource_hash
-                    ):
+                    if self._resource_spec_changed(reconciliation, state):
                         return ReconcileAction.APPLY_SPEC_CHANGED
-                    elif (
-                        (datetime.now(state.ts.tzinfo) - state.ts).total_seconds()
-                        > reconciliation.module_configuration.reconcile_drift_interval_minutes
-                        * 60
+                    elif self._resource_drift_detection_ttl_expired(
+                        reconciliation, state
                     ):
                         return ReconcileAction.APPLY_DRIFT_DETECTION
+                    elif self._reconciliation_module_config_overridden(
+                        reconciliation, state
+                    ):
+                        return ReconcileAction.APPLY_MODULE_CONFIG_OVERRIDDEN
         elif reconciliation.action == Action.DESTROY:
             match state.resource_status:
                 case ResourceStatus.CREATED:
@@ -411,18 +444,13 @@ class ExternalResourcesManager:
         self.dry_runs_validator.validate()
         desired_r = self._get_desired_objects_reconciliations()
         deleted_r = self._get_deleted_objects_reconciliations()
-        reconciliations = desired_r.union(deleted_r)
-        triggered: set[Reconciliation] = set()
-
-        for r in reconciliations:
-            state = self.state_mgr.get_external_resource_state(key=r.key)
-            if (
-                r.action == Action.APPLY
-                and state.reconciliation.resource_hash != r.resource_hash
-            ) or (
-                r.action == Action.DESTROY and not state.resource_status.is_in_progress
-            ):
-                triggered.add(r)
+        triggered = {
+            r
+            for r in desired_r.union(deleted_r)
+            if self._reconciliation_needs_dry_run_run(
+                r, self.state_mgr.get_external_resource_state(key=r.key)
+            )
+        }
 
         threaded.run(
             self.reconciler.reconcile_resource,

reconcile/external_resources/model.py

@@ -7,7 +7,7 @@ from collections.abc import ItemsView, Iterable, Iterator, MutableMapping
 from enum import StrEnum
 from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from reconcile.external_resources.meta import (
     FLAG_DELETE_RESOURCE,
@@ -263,6 +263,7 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
     outputs_secret_image: str = ""
     outputs_secret_version: str = ""
     resources: Resources = Resources()
+    overridden: bool = Field(default=False, exclude=True)
 
     @property
     def image_version(self) -> str:
@@ -278,17 +279,19 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
         spec: ExternalResourceSpec,
         settings: ExternalResourcesSettingsV1,
     ) -> "ExternalResourceModuleConfiguration":
-        module_overrides = spec.metadata.get(
-            "module_overrides"
-        ) or ExternalResourcesModuleOverrides(
-            module_type=None,
-            image=None,
-            version=None,
-            reconcile_timeout_minutes=None,
-            outputs_secret_image=None,
-            outputs_secret_version=None,
-            resources=None,
-        )
+        module_overrides = spec.metadata.get("module_overrides")
+        overridden = module_overrides is not None
+
+        if module_overrides is None:
+            module_overrides = ExternalResourcesModuleOverrides(
+                module_type=None,
+                image=None,
+                version=None,
+                reconcile_timeout_minutes=None,
+                outputs_secret_image=None,
+                outputs_secret_version=None,
+                resources=None,
+            )
 
         return ExternalResourceModuleConfiguration(
             image=module_overrides.image or module.image,
@@ -307,6 +310,7 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
                 or module.resources
                 or settings.module_default_resources
             ),
+            overridden=overridden,
         )
 
 
@@ -358,6 +362,7 @@ class ReconcileAction(StrEnum):
     APPLY_SPEC_CHANGED = "Resource spec has changed"
     APPLY_DRIFT_DETECTION = "Resource drift detection run"
     APPLY_USER_REQUESTED = "Resource reconciliation requested"
+    APPLY_MODULE_CONFIG_OVERRIDDEN = "Module configuration overridden"
     DESTROY_CREATED = "Resource no longer exists in the configuration"
     DESTROY_ERROR = "Resource status in ERROR state"