qontract-reconcile 0.10.1rc836__py3-none-any.whl → 0.10.1rc838__py3-none-any.whl

{qontract_reconcile-0.10.1rc836.dist-info → qontract_reconcile-0.10.1rc838.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc836
+Version: 0.10.1rc838
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc836.dist-info → qontract_reconcile-0.10.1rc838.dist-info}/RECORD

@@ -119,7 +119,7 @@ reconcile/terraform_vpc_peerings.py,sha256=WhGvDHwllM36yTJPE5EzQ1Z0Oc-tT9ksXbBn5
 reconcile/vault_replication.py,sha256=79GZ_kCimPoQcxkdhkWTQxPOAa46E0mNhf05s_Mk5so,17385
 reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPttox6s5o,7177
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/advanced_upgrade_service.py,sha256=MPqcWpq1QeYzBsB8rtTlo102h_cR_q83oOYtWAncuAk,22391
+reconcile/aus/advanced_upgrade_service.py,sha256=T0R-TCeMgkehvY0lscEfmnQa3gx8qf2Ki1F6f5PmS80,23135
 reconcile/aus/aus_label_source.py,sha256=QG3XuKy5tAyJo9ABPHANrDpECxpkzm2LT5C9Xsu42oI,4183
 reconcile/aus/base.py,sha256=n53ZtW5MpBitN745mymFxcq7LT5X8si8U0-l8hH6AEc,49878
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
@@ -443,7 +443,7 @@ reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO
 reconcile/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/statuspage/atlassian.py,sha256=5awxH9ovbtgis_N4aabBvrlo2ZyLNLaO6ezIYDgVq0Y,18571
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
-reconcile/statuspage/page.py,sha256=WHDwV2PXEo4WwI2EgPOkS6j_T7geZEDXTgSaqpDo75U,5101
+reconcile/statuspage/page.py,sha256=vnrifINUNKaBRDauYDjme6sEdTeRMgwsZAifDxlkYec,5248
 reconcile/statuspage/state.py,sha256=HD9EOoKm_nEqCMLIwW809En3cq5VhyzKJPUbsh-bae8,1617
 reconcile/statuspage/status.py,sha256=mfRJ_tW7jM4_Vy_1cc8C0fKJEoA2GwrA3gJeV1KImAw,2834
 reconcile/statuspage/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -820,8 +820,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc836.dist-info/METADATA,sha256=fRTocO0-MVXWsYrNuAy6iAfhpoeUuiY0oaO78AGMBQ4,2275
-qontract_reconcile-0.10.1rc836.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc836.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc836.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc836.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc838.dist-info/METADATA,sha256=E7EKNWOLtL6qDSkQcbJe9jqzBYjff4eZdTXXC04JyQY,2275
+qontract_reconcile-0.10.1rc838.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc838.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc838.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc838.dist-info/RECORD,,

reconcile/aus/advanced_upgrade_service.py

@@ -15,6 +15,7 @@ from reconcile.aus.healthchecks import (
     AUSClusterHealthCheckProvider,
     build_cluster_health_providers_for_organization,
 )
+from reconcile.aus.metrics import AUSOCMEnvironmentError
 from reconcile.aus.models import (
     ClusterUpgradeSpec,
     OrganizationUpgradeSpec,
@@ -37,6 +38,7 @@ from reconcile.gql_definitions.fragments.upgrade_policy import (
     ClusterUpgradePolicyConditionsV1,
     ClusterUpgradePolicyV1,
 )
+from reconcile.utils import metrics
 from reconcile.utils.clusterhealth.providerbase import ClusterHealthProvider
 from reconcile.utils.models import (
     CSV,
@@ -85,14 +87,28 @@ class AdvancedUpgradeServiceIntegration(OCMClusterUpgradeSchedulerOrgIntegration
 
     def get_upgrade_specs(self) -> dict[str, dict[str, OrganizationUpgradeSpec]]:
         inheritance_network = self.init_version_data_network()
-
-        return {
-            ocm_env.name: self._build_ocm_env_upgrade_specs(
-                ocm_env=ocm_env,
-                inheritance_network=inheritance_network,
-            )
-            for ocm_env in self.get_ocm_environments()
-        }
+        envs_org_upgrade_specs: dict[str, dict[str, OrganizationUpgradeSpec]] = {}
+        for ocm_env in self.get_ocm_environments():
+            try:
+                envs_org_upgrade_specs[ocm_env.name] = (
+                    self._build_ocm_env_upgrade_specs(
+                        ocm_env=ocm_env,
+                        inheritance_network=inheritance_network,
+                    )
+                )
+            except Exception as e:
+                logging.exception(
+                    "Failed to get org upgrade specs for OCM environment %s. Skipping. %s",
+                    ocm_env.name,
+                    e,
+                )
+                metrics.inc_counter(
+                    AUSOCMEnvironmentError(
+                        integration=self.name,
+                        ocm_env=ocm_env.name,
+                    )
+                )
+        return envs_org_upgrade_specs
 
     def init_version_data_network(self) -> dict["OrgRef", "VersionDataInheritance"]:
         # collect all version data labels from all OCM environments ...

reconcile/statuspage/page.py

@@ -145,13 +145,16 @@ class StatusMaintenance(BaseModel):
             for c in page_components
             if c.app.name in affected_services
         ]
-        statuspage_announcements = [
-            StatusMaintenanceAnnouncement.init_from_announcement(
-                cast(MaintenanceStatuspageAnnouncementV1, m)
-            )
-            for m in maintenance.announcements or []
-            if m.provider == PROVIDER_NAME
-        ]
+        if affected_components:
+            statuspage_announcements = [
+                StatusMaintenanceAnnouncement.init_from_announcement(
+                    cast(MaintenanceStatuspageAnnouncementV1, m)
+                )
+                for m in maintenance.announcements or []
+                if m.provider == PROVIDER_NAME
+            ]
+        else:
+            statuspage_announcements = [StatusMaintenanceAnnouncement()]
         if len(statuspage_announcements) != 1:
             raise ValueError(
                 f"Maintenanace announcements must include exactly one item of provider {PROVIDER_NAME}"