qontract-reconcile 0.10.2.dev222__py3-none-any.whl → 0.10.2.dev224__py3-none-any.whl

{qontract_reconcile-0.10.2.dev222.dist-info → qontract_reconcile-0.10.2.dev224.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev222
+Version: 0.10.2.dev224
 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.dev222.dist-info → qontract_reconcile-0.10.2.dev224.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=fogdGOnAk-8xK7z9UeLs1rT2IwDs6Q7jSx_iOVAWDLk,42316
+reconcile/openshift_resources_base.py,sha256=728-5nEmWMviSnhQH-EbEp_876VI2PGgC8LnrIfbD3U,42890
 reconcile/openshift_rhcs_certs.py,sha256=obaklp0i-FsmFhY6y7K4bGHKkAUbb86GqqEaYrBo9-4,9985
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
@@ -803,7 +803,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.dev222.dist-info/METADATA,sha256=SFFSQXDuQJ82vGauppa3WrCsWzVdw2HsDJOCqUX14Og,24431
-qontract_reconcile-0.10.2.dev222.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev222.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev222.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev224.dist-info/METADATA,sha256=W3Bf8U-jYuU4vmo0bGfEFaWsoWUiQWDY2nmeQBHvr6U,24431
+qontract_reconcile-0.10.2.dev224.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev224.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev224.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -668,12 +668,22 @@ def fetch_current_state(
             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/
+        # Skip resources managed by the ArgoCD Operator (not ArgoCD Application CRs).
+        # This is determined by the presence of the label:
+        #   app.kubernetes.io/part-of=argocd
+        #
+        # Details:
+        # - The ArgoCD Operator sets this label on resources it manages directly.
+        # - ArgoCD Application CRs do NOT set this label.
+        # - See:
+        #     https://argo-cd.readthedocs.io/en/latest/user-guide/resource_tracking/
+        #     https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/
+        #     https://github.com/argoproj-labs/argocd-operator/blob/master/common/keys.go#L98
         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"
+            _locked_debug_log(
+                f"Skipping {openshift_resource.kind} {openshift_resource.name} in current state "
+                f"for cluster '{cluster}' namespace '{namespace}' because it is managed by the ArgoCD Operator "
+                "(not by an ArgoCD Application CR)."
             )
             continue
         ri.add_current(