qontract-reconcile 0.10.2.dev83__py3-none-any.whl → 0.10.2.dev85__py3-none-any.whl

{qontract_reconcile-0.10.2.dev83.dist-info → qontract_reconcile-0.10.2.dev85.dist-info}/METADATA

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

@@ -129,7 +129,7 @@ reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
 reconcile/aus/models.py,sha256=R72G-2_mx4KHvdIFOzOd2neubu-BBlw5i7hqKVk7W3s,8149
 reconcile/aus/node_pool_spec.py,sha256=FkMggklG-4BgQwud2Swp2m3AAAKzZmeaXgohl9uwxZ8,1138
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=-xliq44ev35P6YzwrGLppReRUWrKDTNptNjaivwICIc,10263
+reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=SHbFEEq9ETtkkuzBBaNuwSDze8fj6DWHeA_XNgOyTbo,10308
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=2uPn13y3QGCHLoKwCc1Z7q9wQsoQf_F1HATMYUbl53s,3695
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=QeZAQ1wdDPcwZ77b3Xmt4yBV60rWi3qd8h-vGwnwoCs,3948
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.dev83.dist-info/METADATA,sha256=TieK7fz_M-bhsVyJT5I9A8b94qT5VaOCbvz_tmqjDx4,24565
-qontract_reconcile-0.10.2.dev83.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev83.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev83.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev85.dist-info/METADATA,sha256=vrGwAn3HqOrv1hAUy75U95p-JGo8Qf35bTOhuopBq0U,24565
+qontract_reconcile-0.10.2.dev85.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev85.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev85.dist-info/RECORD,,

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -88,7 +88,8 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
                     addon_id=addon_id,
                     integration=self.name,
                 ).get(
-                    org_upgrade_spec.org.environment.name, org_upgrade_spec.org.org_id
+                    addon_org_upgrade_spec.org.environment.name,
+                    addon_org_upgrade_spec.org.org_id,
                 )
 
                 addon_current_state: list[AddonUpgradePolicy] = [
@@ -98,13 +99,13 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
                 ]
 
                 self.expose_remaining_soak_day_metrics(
-                    org_upgrade_spec=org_upgrade_spec,
+                    org_upgrade_spec=addon_org_upgrade_spec,
                     version_data=version_data,
                     current_state=addon_current_state,
                     metrics_builder=functools.partial(
                         AUSAddonVersionRemainingSoakDaysGauge,
                         integration=self.name,
-                        ocm_env=org_upgrade_spec.org.environment.name,
+                        ocm_env=addon_org_upgrade_spec.org.environment.name,
                         addon=addon_id,
                     ),
                 )

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