qontract-reconcile 0.10.2.dev23__py3-none-any.whl → 0.10.2.dev24__py3-none-any.whl

{qontract_reconcile-0.10.2.dev23.dist-info → qontract_reconcile-0.10.2.dev24.dist-info}/METADATA

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

@@ -191,7 +191,7 @@ reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU6
 reconcile/dynatrace_token_provider/ocm.py,sha256=MwYCZIxW4f-1jzFTxxN__sity6S8O7bbKUdyTFEVO7U,4325
 reconcile/dynatrace_token_provider/validate.py,sha256=40_9QmHoB3-KBc0k_0D4QO00PpNNPS-gU9Z6cIcWga8,1920
 reconcile/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/endpoints_discovery/integration.py,sha256=63jAVDOcO1iF8zmH2nCmPxHiUGxs83bFTfKfD9vUlEY,14273
+reconcile/endpoints_discovery/integration.py,sha256=fzy5tv4c_6WoAZGGBNJ276NVNB1OESuSJMhZh4-ZNm8,14711
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
 reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRattax4HfoRlhtVzmgro3GiJJ1C4Vc,6392
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -293,7 +293,7 @@ reconcile/gql_definitions/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HB
 reconcile/gql_definitions/dynatrace_token_provider/dynatrace_bootstrap_tokens.py,sha256=5gTuAnR2rnx2k6Rn7FMEAzw6GCZ6F5HZbqkmJ9-3NI4,2244
 reconcile/gql_definitions/dynatrace_token_provider/token_specs.py,sha256=XGsMuB8gowRpqJjkD_KRomx-1OswzyWbF4qjVdhionk,2555
 reconcile/gql_definitions/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=erQqC1twpa7gwV6HJh8C5mYQehlfbEzsSzFbIj8gtyQ,3036
+reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=aBWRAwDUJQ32ghJS4cPQcR9SNl20Fcwd3pxHDB3YJQY,3172
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=XR69j9dpTQ0gv8y-AZN7AJ0dPvO-wbHscyCDgrax6Bk,2046
 reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=cbbvGq1Te9DP8XiFg3bp4Y0q6LxpGYov8ugcROPyPLI,2647
@@ -767,7 +767,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.dev23.dist-info/METADATA,sha256=C5EWqnp2RymXK2IG0ug0lH9gvhe8-litZ1nqLs_iwgQ,24665
-qontract_reconcile-0.10.2.dev23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev23.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev23.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev24.dist-info/METADATA,sha256=3PESZ9C6DwAy3yl39ijxJD9JP3-4K2PC0C-yPyZ0MaI,24665
+qontract_reconcile-0.10.2.dev24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev24.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev24.dist-info/RECORD,,

reconcile/endpoints_discovery/integration.py

@@ -220,6 +220,16 @@ class EndpointsDiscoveryIntegration(
         ]
         return endpoints_to_add, endpoints_to_change, endpoints_to_delete
 
+    def filter_ignored_routes(
+        self, routes: list[Route], labels: dict[str, str]
+    ) -> list[Route]:
+        """Filter out the ignored routes."""
+        return [
+            route
+            for route in routes
+            if f"{QONTRACT_INTEGRATION}-{route.name}" not in labels
+        ]
+
     def process(
         self,
         oc_map: OCMap,
@@ -231,6 +241,7 @@ class EndpointsDiscoveryIntegration(
         apps_with_changes: list[App] = []
         for app in apps:
             app_endpoints = App(name=app.name, path=app.path)
+
             for namespace in app.namespaces or []:
                 if not self.is_enabled(namespace, cluster_names=cluster_names):
                     continue
@@ -238,7 +249,11 @@ class EndpointsDiscoveryIntegration(
                 logging.debug(
                     f"Processing namespace {namespace.cluster.name}/{namespace.name}"
                 )
-                routes = self.get_routes(oc_map, namespace)
+
+                routes = self.filter_ignored_routes(
+                    self.get_routes(oc_map, namespace),
+                    (app.labels or {}) | (namespace.labels or {}),
+                )
                 endpoints_to_add, endpoints_to_change, endpoints_to_delete = (
                     self.get_namespace_endpoint_changes(
                         endpoint_prefix=endpoint_prefix(namespace),

reconcile/gql_definitions/endpoints_discovery/apps.py

@@ -62,12 +62,14 @@ query EndPointsDiscoveryApps {
   apps: apps_v1 {
     path
     name
+    labels
     endPoints {
       name
       url
     }
     namespaces {
       name
+      labels
       delete
       clusterAdmin
       cluster {
@@ -92,6 +94,7 @@ class AppEndPointsV1(ConfiguredBaseModel):
 
 class NamespaceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    labels: Optional[Json] = Field(..., alias="labels")
     delete: Optional[bool] = Field(..., alias="delete")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
     cluster: OcConnectionCluster = Field(..., alias="cluster")
@@ -100,6 +103,7 @@ class NamespaceV1(ConfiguredBaseModel):
 class AppV1(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
+    labels: Optional[Json] = Field(..., alias="labels")
     end_points: Optional[list[AppEndPointsV1]] = Field(..., alias="endPoints")
     namespaces: Optional[list[NamespaceV1]] = Field(..., alias="namespaces")