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

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

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

@@ -207,14 +207,14 @@ reconcile/external_resources/reconciler.py,sha256=-0trp1K-iUgOQn3mm1ZUSmfaReRrUT
 reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
 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=Ta-SLnrHRN4OBAmhE_mTk1P7y1X7AInIiQsIYaY6hY0,2910
-reconcile/fleet_labeler/integration.py,sha256=gDK97QvsJ5IEo1t1ci4yxTRM7VSDj4uP9l30zHi_rWo,7700
+reconcile/fleet_labeler/dependencies.py,sha256=ZOpmtwgxEPBWU2yHRc6rhPwlvqhwYSsNMJQ_jVq1dLI,2993
+reconcile/fleet_labeler/integration.py,sha256=jm2wvkxsxqGLsX_vE874crgce_YsDWyggL3Q3olMNJM,8753
 reconcile/fleet_labeler/merge_request.py,sha256=VA_XSIob4LWYb02dRUr9coXjIa8_0prObI1v5Gqi_mY,1513
 reconcile/fleet_labeler/meta.py,sha256=DF7O4T9wvQ7-xTWXvuNw1OG_F0SBmRrjFBtVy9wWh9U,146
 reconcile/fleet_labeler/metrics.py,sha256=wx9BmXLsN67m-aSsf81iB7Ehj5SzUsS2WB75isUReZg,662
 reconcile/fleet_labeler/ocm.py,sha256=GGsz-bq1g8BJVVMCfI2kSwZCyngbQoZ3i3k8fO608KA,2506
 reconcile/fleet_labeler/validate.py,sha256=gzc2tt7h9F60h7dcyJfEmsnjnfuux5Jtc_WzrIqr-5k,2541
-reconcile/fleet_labeler/vcs.py,sha256=v4e_3l8F6aquVfe-ItLv2WJtS0kjMiRZ6DQ4mzCLOlE,726
+reconcile/fleet_labeler/vcs.py,sha256=6UHUQ08AGAHXF7629I6X-T_E1pvx96LxjS66EeOzve4,1108
 reconcile/glitchtip/README.md,sha256=rfXT6jNP9khJW65jL7I2PgoxvxgcGGuJF8NpbzufEQ4,4335
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip/integration.py,sha256=vCyg8W4ZUGxjU8tB1Gkre_auSpzo83n05mmO8_-7al0,8263
@@ -759,11 +759,11 @@ tools/app_sre_tekton_access_reporter.py,sha256=o9prLUgQpwO3msRWc2as1xT1y9OB3znkp
 tools/app_sre_tekton_access_revalidation.py,sha256=66nHEaY-bIqxIhpcmwN8AvQZu6ZXenfkg4Fut0pVZRM,2726
 tools/glitchtip_access_reporter.py,sha256=o01A6b88t3Wie6tj_tJWWVo2J01LxQ_a9giGm4UzEaU,2901
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=dmCg4SF286H9xgepCe36noYj3hvQPDNFpZNw6jG_AQ0,152870
+tools/qontract_cli.py,sha256=_KHwJIC0Keyy2cmhUVruOYtmp1CrTZDzEZkEe8lf81I,152941
 tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaBNFA,5062
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/cli_commands/container_images_report.py,sha256=8fG9XU-eEhJ7hKCdQzBcdPpvIJR-8WGkHOgFEulpfYQ,5213
+tools/cli_commands/container_images_report.py,sha256=SXh6sZ1dXXzd-2R5eeBufCtW3J4-Y55--0MZLdo4lr8,5409
 tools/cli_commands/erv2.py,sha256=VxUlNXllo947UwmtvS-42IeI9x_t_X3MHrrSI3K_GRo,23274
 tools/cli_commands/gpg_encrypt.py,sha256=JWwds_Qg7KhSJMIGUh8TfI5-Jf17iUtmaEi4kWJxfVE,4907
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
@@ -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.dev84.dist-info/METADATA,sha256=ADSQ8m5I4AsabrHgrshKyi8g1jMaVE9KZ45HBZeiRE4,24565
-qontract_reconcile-0.10.2.dev84.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev84.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev84.dist-info/RECORD,,
+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,,

reconcile/fleet_labeler/dependencies.py

@@ -27,10 +27,12 @@ class Dependencies:
         label_specs_by_name: Mapping[str, FleetLabelsSpecV1],
         ocm_clients_by_label_spec_name: Mapping[str, OCMClient],
         vcs: VCS,
+        dry_run: bool,
     ):
         self.label_specs_by_name = label_specs_by_name
         self.ocm_clients_by_label_spec_name = ocm_clients_by_label_spec_name
         self.vcs = vcs
+        self.dry_run = dry_run
 
     @classmethod
     def create(
@@ -42,6 +44,7 @@ class Dependencies:
             label_specs_by_name=_label_specs(),
             ocm_clients_by_label_spec_name=_ocm_clients(secret_reader=secret_reader),
             vcs=_vcs(secret_reader=secret_reader, dry_run=dry_run),
+            dry_run=dry_run,
         )
 
 

reconcile/fleet_labeler/integration.py

@@ -16,7 +16,7 @@ from reconcile.fleet_labeler.meta import (
 from reconcile.fleet_labeler.metrics import FleetLabelerDuplicateClusterMatchesGauge
 from reconcile.fleet_labeler.ocm import OCMClient
 from reconcile.fleet_labeler.validate import validate_label_specs
-from reconcile.fleet_labeler.vcs import VCS
+from reconcile.fleet_labeler.vcs import VCS, Gitlab404Error
 from reconcile.gql_definitions.fleet_labeler.fleet_labels import (
     FleetLabelDefaultV1,
     FleetLabelsSpecV1,
@@ -60,7 +60,10 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
         validate_label_specs(specs=dependencies.label_specs_by_name)
         for spec_name, ocm in dependencies.ocm_clients_by_label_spec_name.items():
             self._sync_cluster_inventory(
-                ocm, dependencies.label_specs_by_name[spec_name], dependencies.vcs
+                ocm=ocm,
+                spec=dependencies.label_specs_by_name[spec_name],
+                vcs=dependencies.vcs,
+                dry_run=dependencies.dry_run,
             )
 
     def _render_default_labels(
@@ -112,7 +115,11 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
             return stream.getvalue()
 
     def _sync_cluster_inventory(
-        self, ocm: OCMClient, spec: FleetLabelsSpecV1, vcs: VCS
+        self,
+        ocm: OCMClient,
+        spec: FleetLabelsSpecV1,
+        vcs: VCS,
+        dry_run: bool,
     ) -> None:
         class ClusterData(BaseModel):
             """
@@ -189,7 +196,23 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                 f"[{spec.name}] Deleting cluster {cluster_id=} from inventory."
             )
 
-        current_content = vcs.get_file_content_from_main(path=spec.path)
+        # When adding a new label spec file, then we dont have any existing content in main yet.
+        # This is a chicken-egg problem, but if we are in dry-run we can skip these steps on 404s.
+        # Note, that the diff is already printed above, so we can make a good decision if desired
+        # content fits.
+        # If the content exists in main, then it doesnt harm to also run the rendering procedure.
+        try:
+            current_content = vcs.get_file_content_from_main(path=spec.path)
+        except Gitlab404Error:
+            if dry_run:
+                logging.info(
+                    f"The file data{spec.path} does not exist in main branch yet. This is likely because it is being created with this MR. We are skipping rendering steps."
+                )
+                return
+            # 404 must never happen on non-dry-run, as the file must have already passed
+            # MR check and must have been merged to main
+            raise
+
         # Lets make sure we are deterministic when adding new clusters
         # The overhead is neglectable and it makes testing easier
         sorted_clusters_to_add = sorted(clusters_to_add, key=lambda c: c.name)

reconcile/fleet_labeler/vcs.py

@@ -1,7 +1,13 @@
+from gitlab.exceptions import GitlabGetError
+
 from reconcile.fleet_labeler.merge_request import FleetLabelerUpdates
 from reconcile.utils.vcs import VCS as VCSBase
 
 
+class Gitlab404Error(Exception):
+    pass
+
+
 class VCS:
     """
     Thin abstractions of reconcile.utils.vcs module to reduce coupling and simplify tests.
@@ -11,9 +17,16 @@ class VCS:
         self._vcs = vcs
 
     def get_file_content_from_main(self, path: str) -> str:
-        return self._vcs.get_file_content_from_app_interface_ref(
-            file_path=path, ref="main"
-        )
+        try:
+            return self._vcs.get_file_content_from_app_interface_ref(
+                file_path=path, ref="main"
+            )
+        except GitlabGetError as e:
+            if e.response_code != 404:
+                raise
+            raise Gitlab404Error(
+                f"File at ${path} does not exist yet in main branch. Maybe it is just being created with this MR?"
+            ) from e
 
     def open_merge_request(self, path: str, content: str) -> None:
         mr = FleetLabelerUpdates(path=path, content=content)

tools/cli_commands/container_images_report.py

@@ -6,11 +6,11 @@ from typing import Any
 from pydantic import BaseModel
 from sretoolbox.utils import threaded
 
-from reconcile.gql_definitions.common.namespaces_minimal import NamespaceV1
+from reconcile.gql_definitions.common.namespaces import NamespaceV1
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
-from reconcile.typed_queries.namespaces_minimal import get_namespaces_minimal
+from reconcile.typed_queries.namespaces import get_namespaces
 from reconcile.utils.oc_filters import filter_namespaces_by_cluster_and_namespace
 from reconcile.utils.oc_map import OCMap, init_oc_map_from_namespaces
 from reconcile.utils.secret_reader import create_secret_reader
@@ -22,6 +22,7 @@ IMAGE_NAME_REGEX = re.compile(
 
 class NamespaceImages(BaseModel):
     namespace_name: str
+    app_name: str
     image_names: list[str] | None = None
     error_message: str | None = None
 
@@ -40,7 +41,7 @@ def get_all_pods_images(
       * namespaces:  a comma separated list of namespaces where the instance is used
       * count: number of uses of the image
     """
-    all_namespaces = get_namespaces_minimal()
+    all_namespaces = get_namespaces()
     namespaces = filter_namespaces_by_cluster_and_namespace(
         namespaces=all_namespaces,
         cluster_names=cluster_name,
@@ -89,6 +90,7 @@ def fetch_pods_images_from_namespaces(
 
         for name in ni.image_names or []:
             result[name]["namespaces"].add(ni.namespace_name)
+            result[name]["apps"].add(ni.app_name)
             result[name]["count"] += 1
 
     exclude_pattern_compiled: re.Pattern | None = None
@@ -109,6 +111,7 @@ def fetch_pods_images_from_namespaces(
         result_filtered_flattened.append({
             "name": name,
             "namespaces": ",".join(sorted(value["namespaces"])),
+            "apps": ",".join(sorted(value["apps"])),
             "count": value["count"],
         })
 
@@ -119,6 +122,7 @@ def fetch_pods_images_from_namespaces(
             result_filtered_flattened.append({
                 "name": "error",
                 "namespaces": message,
+                "apps": "",
                 "count": count,
             })
 
@@ -126,7 +130,7 @@ def fetch_pods_images_from_namespaces(
 
 
 def _get_all_images_default() -> dict[str, Any]:
-    return {"namespaces": set(), "count": 0}
+    return {"namespaces": set(), "apps": set(), "count": 0}
 
 
 def _get_namespace_images(ns: NamespaceV1, oc_map: OCMap) -> NamespaceImages:
@@ -145,10 +149,12 @@ def _get_namespace_images(ns: NamespaceV1, oc_map: OCMap) -> NamespaceImages:
     except Exception as exc:
         return NamespaceImages(
             namespace_name=ns.name,
+            app_name=ns.app.name,
             error_message=str(exc),
         )
 
     return NamespaceImages(
         namespace_name=ns.name,
+        app_name=ns.app.name,
         image_names=image_names,
     )

tools/qontract_cli.py

@@ -4528,6 +4528,7 @@ def container_images(
             "fields": [
                 {"key": "name", "sortable": True},
                 {"key": "namespaces", "sortable": True},
+                {"key": "apps", "sortable": True},
                 {"key": "count", "sortable": True},
             ],
             "items": results,
@@ -4548,6 +4549,7 @@ You can view the source of this Markdown to extract the JSON data.
         columns = [
             "name",
             "namespaces",
+            "apps",
             "count",
         ]
         ctx.obj["options"]["sort"] = False