qontract-reconcile 0.10.2.dev209__py3-none-any.whl → 0.10.2.dev214__py3-none-any.whl

{qontract_reconcile-0.10.2.dev209.dist-info → qontract_reconcile-0.10.2.dev214.dist-info}/METADATA

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

@@ -71,8 +71,8 @@ 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_rhcs_certs.py,sha256=lP0GwKMRl8YBzxrwdbBOxrPqIPYNmu2KkZPGzWKyRVU,9859
+reconcile/openshift_resources_base.py,sha256=fogdGOnAk-8xK7z9UeLs1rT2IwDs6Q7jSx_iOVAWDLk,42316
+reconcile/openshift_rhcs_certs.py,sha256=1HfQRMAftafQzJTAUKz98WhIbNR5SC9iCD-C92HZV_4,9932
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
@@ -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.dev209.dist-info/METADATA,sha256=QKUofEI-f485b9dZemKXq6v2vV1nQPGJDX3BaZL1_g4,24555
-qontract_reconcile-0.10.2.dev209.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev209.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev209.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev214.dist-info/METADATA,sha256=v5PuwHiAY6FhlSgoeJwmibmuBtdVMx9AvVe1IklU6Wo,24555
+qontract_reconcile-0.10.2.dev214.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev214.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev214.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/openshift_rhcs_certs.py

@@ -22,6 +22,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
 )
 from reconcile.typed_queries.rhcs_provider_settings import get_rhcs_provider_settings
 from reconcile.utils import gql, metrics
+from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.metrics import GaugeMetric, normalize_integration_name
 from reconcile.utils.oc_map import init_oc_map_from_namespaces
@@ -235,6 +236,7 @@ def fetch_desired_state(
                 )
 
 
+@defer
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
@@ -259,6 +261,7 @@ def run(
         use_jump_host=use_jump_host,
         thread_pool_size=thread_pool_size,
     )
+    defer(oc_map.cleanup)
     ri = ResourceInventory()
     state_specs = ob.init_specs_to_fetch(
         ri,