qontract-reconcile 0.10.1rc999__py3-none-any.whl → 0.10.1rc1000__py3-none-any.whl

{qontract_reconcile-0.10.1rc999.dist-info → qontract_reconcile-0.10.1rc1000.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc999
+Version: 0.10.1rc1000
 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.1rc999.dist-info → qontract_reconcile-0.10.1rc1000.dist-info}/RECORD

@@ -120,16 +120,17 @@ reconcile/terraform_vpc_peerings.py,sha256=VLSfuO7FvHN5McopRiKoKJDHCmIhYtlJEHv_h
 reconcile/vault_replication.py,sha256=isfmNaqxl4AC90n8sVJffUt685sPBfhNSvjks6DoQXg,17339
 reconcile/vpc_peerings_validator.py,sha256=-upvNg3ggKCxcJ4kqZcqJVsiltlhQ8MyyLZiWX8eYmE,7068
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/advanced_upgrade_service.py,sha256=KsXSIbuaNjg3r3iXEWPCosKEWNKq9MZDf9mwRFn9xdY,23093
+reconcile/aus/advanced_upgrade_service.py,sha256=NF3UQ02MdUpVPup50EqnTbTn3dRHGoXoSfFLZxOjr8Q,23744
 reconcile/aus/aus_label_source.py,sha256=2Rktyvs7ZvCwsRwmbGUhddycTBTq0jHq8wpBaiDHAMA,4165
-reconcile/aus/base.py,sha256=_1y0gH_Z-WBVaAiNZogDwBymjLb7wcHS8eAuMJWZbZg,49800
+reconcile/aus/base.py,sha256=lrYqt-fUNM9gISbEgk93yewXf6a6bZfEFN2EL144JFs,49432
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
-reconcile/aus/models.py,sha256=zReascmYDZV-5sAlGm7SUMyp363etE8BM0qs-q2nfdk,7338
+reconcile/aus/models.py,sha256=MSKX7SY0GDw7BgpIuKeLT3i_v8E1LFz4M0DQAL7JWUM,7783
+reconcile/aus/node_pool_spec.py,sha256=FkMggklG-4BgQwud2Swp2m3AAAKzZmeaXgohl9uwxZ8,1138
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=t2_J7CuovTm6FGvwWI6HsyiftPbt3ZRWEKjsGmIRcEI,10207
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=2uPn13y3QGCHLoKwCc1Z7q9wQsoQf_F1HATMYUbl53s,3695
-reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=f7pE_XrX9695EMZpg-CFZiakZ9vZ9BoRpkE2I9UC0sI,3190
+reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=yXUNd-r_VVqcq_dkODap6dAN3S4Dk3F_WOc1C7xejyk,3914
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/version_gate_approver.py,sha256=iZg7l-VgcgyVf7jV9mLZzXq3d22r8feAnl-1LDVUJR4,7358
 reconcile/aus/version_gates/__init__.py,sha256=AlfmPhMbuuRnJloODTKTgPhM-iFSW3XKsJhbiewBT1s,454
@@ -778,7 +779,7 @@ reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXN
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
 reconcile/utils/ocm/base.py,sha256=iL_uMN03URDisWHpsaGGto_pLx652epUkuld_9ctx5o,14555
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
-reconcile/utils/ocm/clusters.py,sha256=Fn4swizm1qq-XiNlIZ9SvahkftWAyNT8hF4kqRBpK4g,8287
+reconcile/utils/ocm/clusters.py,sha256=VwFucqOtXfHZABZLsMLxvAhBTwVg6h9L7WDDdJUaB1w,7962
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
 reconcile/utils/ocm/label_sources.py,sha256=ES_5VP4X6gsRxMFZ95WgbwE_HqqIUo_JRjHjdGYw6Ss,1846
 reconcile/utils/ocm/labels.py,sha256=aCsL5QkRk32hZeJwsSJuCCT9sbojWMn8LL5Zo-aoFb4,5916
@@ -856,8 +857,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc999.dist-info/METADATA,sha256=enfD2JTSaUoouoeieJwg_fjf-OzHHSLEBR7icP_Nk1Y,2262
-qontract_reconcile-0.10.1rc999.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc999.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc999.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc999.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1000.dist-info/METADATA,sha256=JStF4I4I3sYMBMP948ovqQ5qMT4zRymFFR6M6cdf-Qo,2263
+qontract_reconcile-0.10.1rc1000.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1000.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1000.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1000.dist-info/RECORD,,

reconcile/aus/advanced_upgrade_service.py

@@ -18,8 +18,12 @@ from reconcile.aus.healthchecks import (
 from reconcile.aus.metrics import AUSOCMEnvironmentError
 from reconcile.aus.models import (
     ClusterUpgradeSpec,
+    NodePoolSpec,
     OrganizationUpgradeSpec,
 )
+from reconcile.aus.node_pool_spec import (
+    get_node_pool_specs_by_org_cluster,
+)
 from reconcile.aus.ocm_upgrade_scheduler_org import (
     OCMClusterUpgradeSchedulerOrgIntegration,
 )
@@ -148,6 +152,9 @@ class AdvancedUpgradeServiceIntegration(OCMClusterUpgradeSchedulerOrgIntegration
             labels_by_org = _get_org_labels(
                 ocm_api=ocm_api, org_ids=set(organizations.keys())
             )
+            node_pool_specs_by_org_cluster = get_node_pool_specs_by_org_cluster(
+                ocm_api, clusters_by_org
+            )
 
         cluster_health_providers = self._health_check_providers_for_env(ocm_env.name)
 
@@ -159,6 +166,7 @@ class AdvancedUpgradeServiceIntegration(OCMClusterUpgradeSchedulerOrgIntegration
                 org_ref.org_id: vdi for org_ref, vdi in inheritance_network.items()
             },
             cluster_health_providers=cluster_health_providers,
+            node_pool_specs_by_org_cluster=node_pool_specs_by_org_cluster,
         )
 
     def signal_validation_issues(
@@ -243,6 +251,7 @@ def _build_org_upgrade_specs_for_ocm_env(
     labels_by_org: dict[str, LabelContainer],
     inheritance_network: dict[str, "VersionDataInheritance"],
     cluster_health_providers: dict[str, ClusterHealthProvider],
+    node_pool_specs_by_org_cluster: dict[str, dict[str, list[NodePoolSpec]]],
 ) -> dict[str, OrganizationUpgradeSpec]:
     """
     Builds the cluster upgrade specs for the given OCM environment.
@@ -258,6 +267,8 @@ def _build_org_upgrade_specs_for_ocm_env(
                 org=orgs[org_id],
                 providers=cluster_health_providers,
             ),
+            node_pool_specs_by_cluster_id=node_pool_specs_by_org_cluster.get(org_id)
+            or {},
         )
         for org_id, clusters in clusters_by_org.items()
     }
@@ -315,6 +326,7 @@ def _build_org_upgrade_spec(
     org_labels: LabelContainer,
     version_data_inheritance: Optional["VersionDataInheritance"],
     cluster_health_provider: AUSClusterHealthCheckProvider,
+    node_pool_specs_by_cluster_id: dict[str, list[NodePoolSpec]],
 ) -> OrganizationUpgradeSpec:
     """
     Build a upgrade policy spec for each cluster in the organization that
@@ -359,6 +371,7 @@ def _build_org_upgrade_spec(
                     upgradePolicy=upgrade_policy,
                     cluster=c.ocm_cluster,
                     health=cluster_health,
+                    nodePools=node_pool_specs_by_cluster_id.get(c.ocm_cluster.id) or [],
                 )
             )
         except ValidationError as validation_error:

reconcile/aus/base.py

@@ -74,8 +74,6 @@ from reconcile.utils.filtering import remove_none_values_from_dict
 from reconcile.utils.ocm.addons import AddonService, AddonServiceV1, AddonServiceV2
 from reconcile.utils.ocm.clusters import (
     OCMCluster,
-    get_node_pools,
-    get_version,
 )
 from reconcile.utils.ocm.upgrades import (
     OCMVersionGate,
@@ -296,7 +294,7 @@ class AdvancedUpgradeSchedulerBaseIntegration(
                     org_id=cluster_upgrade_spec.org.org_id,
                     org_name=org_upgrade_spec.org.name,
                     channel=cluster_upgrade_spec.cluster.version.channel_group,
-                    current_version=cluster_upgrade_spec.current_version,
+                    current_version=cluster_upgrade_spec.oldest_current_version,
                     cluster_name=cluster_upgrade_spec.name,
                     schedule=cluster_upgrade_spec.upgrade_policy.schedule,
                     sector=cluster_upgrade_spec.upgrade_policy.conditions.sector or "",
@@ -607,13 +605,13 @@ def fetch_current_state(
             for upgrade_policy in upgrade_policies:
                 upgrade_policy["cluster"] = spec.cluster
                 current_state.append(ControlPlaneUpgradePolicy(**upgrade_policy))
-            for node_pool in get_node_pools(ocm_api, spec.cluster.id):
+            for node_pool in spec.node_pools:
                 node_upgrade_policies = get_node_pool_upgrade_policies(
-                    ocm_api, spec.cluster.id, node_pool["id"]
+                    ocm_api, spec.cluster.id, node_pool.id
                 )
                 for upgrade_policy in node_upgrade_policies:
                     upgrade_policy["cluster"] = spec.cluster
-                    upgrade_policy["node_pool"] = node_pool["id"]
+                    upgrade_policy["node_pool"] = node_pool.id
                     current_state.append(NodePoolUpgradePolicy(**upgrade_policy))
         else:
             upgrade_policies = get_upgrade_policies(ocm_api, spec.cluster.id)
@@ -1002,27 +1000,23 @@ def _create_upgrade_policy(
 
 
 def _calculate_node_pool_diffs(
-    ocm_api: OCMBaseClient, spec: ClusterUpgradeSpec, now: datetime
+    spec: ClusterUpgradeSpec, now: datetime
 ) -> UpgradePolicyHandler | None:
-    node_pools = get_node_pools(ocm_api, spec.cluster.id)
-    if node_pools:
-        for pool in node_pools:
-            pool_version_id = pool.get("version", {}).get("id")
-            pool_version = get_version(ocm_api, pool_version_id)["raw_id"]
-            if parse_semver(pool_version).match(f"<{spec.current_version}"):
-                next_schedule = (now + timedelta(minutes=MIN_DELTA_MINUTES)).strftime(
-                    "%Y-%m-%dT%H:%M:%SZ"
-                )
-                return UpgradePolicyHandler(
-                    action="create",
-                    policy=NodePoolUpgradePolicy(
-                        cluster=spec.cluster,
-                        version=spec.current_version,
-                        schedule_type="manual",
-                        next_run=next_schedule,
-                        node_pool=pool["id"],
-                    ),
-                )
+    for pool in spec.node_pools:
+        if parse_semver(pool.version).match(f"<{spec.current_version}"):
+            next_schedule = (now + timedelta(minutes=MIN_DELTA_MINUTES)).strftime(
+                "%Y-%m-%dT%H:%M:%SZ"
+            )
+            return UpgradePolicyHandler(
+                action="create",
+                policy=NodePoolUpgradePolicy(
+                    cluster=spec.cluster,
+                    version=spec.current_version,
+                    schedule_type="manual",
+                    next_run=next_schedule,
+                    node_pool=pool.id,
+                ),
+            )
     return None
 
 
@@ -1072,7 +1066,7 @@ def calculate_diff(
             if verify_lock_should_skip(spec, locked):
                 continue
 
-            node_pool_update = _calculate_node_pool_diffs(ocm_api, spec, now)
+            node_pool_update = _calculate_node_pool_diffs(spec, now)
             if node_pool_update:  # node pool update policy not yet created
                 diffs.append(node_pool_update)
                 set_mutex(locked, spec.cluster.id, spec.effective_mutexes)

reconcile/aus/models.py

@@ -22,6 +22,11 @@ from reconcile.utils.ocm.clusters import OCMCluster
 from reconcile.utils.semver_helper import parse_semver
 
 
+class NodePoolSpec(BaseModel):
+    id: str
+    version: str
+
+
 class ClusterUpgradeSpec(BaseModel):
     """
     An upgrade spec for a cluster.
@@ -31,6 +36,7 @@ class ClusterUpgradeSpec(BaseModel):
     cluster: OCMCluster
     upgrade_policy: ClusterUpgradePolicyV1 = Field(..., alias="upgradePolicy")
     health: AUSClusterHealth
+    node_pools: list[NodePoolSpec] = Field(default_factory=list, alias="nodePools")
 
     @property
     def name(self) -> str:
@@ -44,6 +50,14 @@ class ClusterUpgradeSpec(BaseModel):
     def current_version(self) -> str:
         return self.cluster.version.raw_id
 
+    @property
+    def oldest_current_version(self) -> str:
+        """
+        Consider versions in node pools and the cluster itself, find the oldest one.
+        """
+        versions = [np.version for np in self.node_pools] + [self.current_version]
+        return min(versions, key=parse_semver)
+
     @property
     def blocked_versions(self) -> set[str]:
         return set(self.org.blocked_versions or []) | set(

reconcile/aus/node_pool_spec.py

@@ -0,0 +1,35 @@
+from collections.abc import Iterable, Mapping
+
+from reconcile.aus.models import NodePoolSpec
+from reconcile.utils.ocm import get_node_pools
+from reconcile.utils.ocm.base import ClusterDetails
+from reconcile.utils.ocm_base_client import OCMBaseClient
+
+
+def get_node_pool_specs(ocm_api: OCMBaseClient, cluster_id: str) -> list[NodePoolSpec]:
+    node_pools = get_node_pools(ocm_api, cluster_id)
+    return [
+        NodePoolSpec(
+            id=p["id"],
+            version=p["version"]["raw_id"],
+        )
+        for p in node_pools
+    ]
+
+
+def get_node_pool_specs_by_org_cluster(
+    ocm_api: OCMBaseClient,
+    clusters_by_org: Mapping[str, Iterable[ClusterDetails]],
+) -> dict[str, dict[str, list[NodePoolSpec]]]:
+    """
+    Fetch node pool specs for all rosa hypershift clusters
+    Returns a dict with org IDs as keys, the values are dicts with cluster id as key
+    """
+    return {
+        org_id: {
+            c.ocm_cluster.id: get_node_pool_specs(ocm_api, c.ocm_cluster.id)
+            for c in clusters
+            if c.ocm_cluster.is_rosa_hypershift()
+        }
+        for org_id, clusters in clusters_by_org.items()
+    }

reconcile/aus/ocm_upgrade_scheduler_org.py

@@ -1,11 +1,15 @@
+from collections import defaultdict
+
 from reconcile.aus.healthchecks import (
     AUSClusterHealthCheckProvider,
     build_cluster_health_providers_for_organization,
 )
 from reconcile.aus.models import (
     ClusterUpgradeSpec,
+    NodePoolSpec,
     OrganizationUpgradeSpec,
 )
+from reconcile.aus.node_pool_spec import get_node_pool_specs_by_org_cluster
 from reconcile.aus.ocm_upgrade_scheduler import OCMClusterUpgradeSchedulerIntegration
 from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganization
 from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
@@ -41,6 +45,15 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
                 ocm_env.name
             )
 
+            clusters_by_org = defaultdict(list)
+            for cluster in clusters:
+                clusters_by_org[cluster.organization_id].append(cluster)
+
+            node_pool_specs_by_org_cluster = get_node_pool_specs_by_org_cluster(
+                ocm_api,
+                clusters_by_org,
+            )
+
             return {
                 org.name: OrganizationUpgradeSpec(
                     org=org,
@@ -48,13 +61,15 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
                         org=org,
                         clusters_by_name={
                             c.ocm_cluster.name: c.ocm_cluster
-                            for c in clusters
-                            if c.organization_id == org.org_id
+                            for c in clusters_by_org[org.org_id]
                         },
                         cluster_health_provider=build_cluster_health_providers_for_organization(
                             org=org,
                             providers=cluster_health_providers,
                         ),
+                        node_pool_specs_by_cluster_id=node_pool_specs_by_org_cluster[
+                            org.org_id
+                        ],
                     ),
                 )
                 for org in organizations
@@ -65,6 +80,7 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
         org: AUSOCMOrganization,
         clusters_by_name: dict[str, OCMCluster],
         cluster_health_provider: AUSClusterHealthCheckProvider,
+        node_pool_specs_by_cluster_id: dict[str, list[NodePoolSpec]],
     ) -> list[ClusterUpgradeSpec]:
         return [
             ClusterUpgradeSpec(
@@ -75,9 +91,10 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
                     cluster_external_id=clusters_by_name[cluster.name].external_id,
                     org_id=org.org_id,
                 ),
+                nodePools=node_pool_specs_by_cluster_id.get(ocm_cluster.id) or [],
             )
             for cluster in org.upgrade_policy_clusters or []
             # clusters that are not in the UUID dict will be ignored because
             # they don't exist in the OCM organization (or have been deprovisioned)
-            if cluster.name in clusters_by_name
+            if (ocm_cluster := clusters_by_name.get(cluster.name))
         ]

reconcile/utils/ocm/clusters.py

@@ -3,7 +3,6 @@ from collections.abc import (
     Generator,
     Iterable,
 )
-from functools import lru_cache
 from typing import Any
 
 from reconcile.utils.ocm.base import (
@@ -42,11 +41,6 @@ NODE_POOL_DESIRED_KEYS = {
     "version",
 }
 
-VERSION_DESIRED_KEYS = {
-    "id",
-    "raw_id",
-}
-
 
 def discover_clusters_by_labels(
     ocm_api: OCMBaseClient, label_filter: Filter
@@ -246,14 +240,6 @@ def get_node_pools(ocm_api: OCMBaseClient, cluster_id: str) -> list[dict[str, An
     return results
 
 
-@lru_cache
-def get_version(ocm_api: OCMBaseClient, version: str) -> dict[str, Any]:
-    api = f"/api/clusters_mgmt/v1/versions/{version}"
-
-    item = ocm_api.get(api)
-    return {k: v for k, v in item.items() if k in VERSION_DESIRED_KEYS}
-
-
 def get_provisioning_shard_id(ocm_api: OCMBaseClient, cluster_id: str) -> str:
     api = f"/api/clusters_mgmt/v1/clusters/{cluster_id}/provision_shard"