qontract-reconcile 0.10.2.dev91__py3-none-any.whl → 0.10.2.dev92__py3-none-any.whl

{qontract_reconcile-0.10.2.dev91.dist-info → qontract_reconcile-0.10.2.dev92.dist-info}/METADATA

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

@@ -208,11 +208,11 @@ reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzU
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=ZOpmtwgxEPBWU2yHRc6rhPwlvqhwYSsNMJQ_jVq1dLI,2993
-reconcile/fleet_labeler/integration.py,sha256=x-vfUcWRCI8-_2O1mdEdSbqGM51IwEBgUUKQPlu5_TM,12849
+reconcile/fleet_labeler/integration.py,sha256=IeDUDlIIZREQRbsODB9xsCMoNrMk5738OF_fP7lUGFs,13128
 reconcile/fleet_labeler/merge_request.py,sha256=SfGxXInxeJzVnsTtO0ZC9-PesUJMdpKxKY9eCB6ms-g,1538
 reconcile/fleet_labeler/meta.py,sha256=lWnpH2U0PHCPXu9Ok_CPmO494qQJQ5pOuqo28s0jzIQ,146
 reconcile/fleet_labeler/metrics.py,sha256=wx9BmXLsN67m-aSsf81iB7Ehj5SzUsS2WB75isUReZg,662
-reconcile/fleet_labeler/ocm.py,sha256=1VkUZtgcoqg-F9r--VtTg2LReumkOcRBIPhj-yTCKE0,3470
+reconcile/fleet_labeler/ocm.py,sha256=qcg1_p7nKlZG7-MQeOZos3rz6YSPAPh-HKxE3OVJwe0,4165
 reconcile/fleet_labeler/validate.py,sha256=gzc2tt7h9F60h7dcyJfEmsnjnfuux5Jtc_WzrIqr-5k,2541
 reconcile/fleet_labeler/vcs.py,sha256=6UHUQ08AGAHXF7629I6X-T_E1pvx96LxjS66EeOzve4,1108
 reconcile/glitchtip/README.md,sha256=rfXT6jNP9khJW65jL7I2PgoxvxgcGGuJF8NpbzufEQ4,4335
@@ -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.dev91.dist-info/METADATA,sha256=Zb9JTF0crcCR37ioM_rENLPJWgXh1_1IyFQGxR8kqx8,24565
-qontract_reconcile-0.10.2.dev91.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev91.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev91.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev92.dist-info/METADATA,sha256=jLJhRpJR82Z3TVBJRPKXiwDJF_rs9_Vz9L9aaajBipo,24565
+qontract_reconcile-0.10.2.dev92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev92.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev92.dist-info/RECORD,,

reconcile/fleet_labeler/integration.py

@@ -105,9 +105,13 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
         for label_default in spec.label_defaults:
             match_subscription_labels = dict(label_default.match_subscription_labels)
             for cluster in ocm.discover_clusters_by_labels(
-                labels=match_subscription_labels
+                labels=match_subscription_labels,
+                managed_prefix=spec.managed_subscription_label_prefix,
             ):
-                # TODO: ideally we filter on server side - see TODO in ocm.py
+                # Note, due to the nature of how our label filtering works (see ocm.py), we
+                # also fetch clusters that do not match the filter label.
+                # Here, we filter the clusters on client side.
+                # TODO: move this into utils.ocm module
                 if (
                     match_subscription_labels.items()
                     <= cluster.subscription_labels.items()

reconcile/fleet_labeler/ocm.py

@@ -71,17 +71,32 @@ class OCMClient:
     def __init__(self, ocm_client: OCMBaseClient):
         self._ocm_client = ocm_client
 
-    def discover_clusters_by_labels(self, labels: Mapping[str, str]) -> list[Cluster]:
+    def discover_clusters_by_labels(
+        self, labels: Mapping[str, str], managed_prefix: str
+    ) -> list[Cluster]:
         label_filter = Filter(mode=FilterMode.AND).eq("type", "Subscription")
         for key in labels:
             label_filter = label_filter.eq("Key", key)
-        # TODO: This throws 400 bad request
-        # for k, v in labels.items():
-        #     label_filter = label_filter.eq(k, v)
+        desired_labels_filter = (
+            Filter(mode=FilterMode.AND)
+            .eq("type", "Subscription")
+            .like(
+                "key",
+                f"{managed_prefix}.%",
+            )
+        )
+        # Note, that discover_clusters_by_labels() only fetches labels that are matching the filter!
+        # However, to understand current state, we also want to know the labels under managed_prefix.
+        # I.e., we need a fetch condition such as:
+        # ("{managed_prefix}.%") OR ("{key1_filter}" AND "{key2_filter}" ....)
+        # The above returns also clusters that do not fit the match label.
+        # I.e., we must filter the result on client side.
+        # TODO: do this in utils.ocm module
+        desired_filter = label_filter | desired_labels_filter
         return [
             Cluster.from_cluster_details(cluster)
             for cluster in discover_clusters_by_labels(
-                ocm_api=self._ocm_client, label_filter=label_filter
+                ocm_api=self._ocm_client, label_filter=desired_filter
             )
         ]