qontract-reconcile 0.10.1rc692__py3-none-any.whl → 0.10.1rc694__py3-none-any.whl

{qontract_reconcile-0.10.1rc692.dist-info → qontract_reconcile-0.10.1rc694.dist-info}/METADATA

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

@@ -9,7 +9,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
-reconcile/cli.py,sha256=2cp3O1XtwAdmN5VN7I7J-sUX41gRS2Y2lWoj-l4aZ_8,93610
+reconcile/cli.py,sha256=Xj_msd-518yR9r1hy39FI3Q9gBRZQsfM9HRA-Ep6CKY,93661
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
@@ -92,7 +92,7 @@ reconcile/quay_mirror.py,sha256=9NzbNoxl-NdD8CwImcXNG5xTdHmUJxBfeVk5XHH41J8,1488
 reconcile/quay_mirror_org.py,sha256=Oq-t3kSkgfeSAOUDjLCDRBeEvOIEBacfX38qrX_s0oc,10801
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=wvlKhaLgID1YhHSLHW9h8C6BjyiB--y11J0XMLf4vdo,50547
+reconcile/queries.py,sha256=hgQizeUT5_a1ZI9i8wH-ajr7e956u5ynIp90zKMeRCA,50560
 reconcile/query_validator.py,sha256=BAjGrU8_VhzTOv5k0-uz0hY9ziZyconv8VAhgre1Auc,1497
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -120,12 +120,12 @@ reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPtt
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=MPqcWpq1QeYzBsB8rtTlo102h_cR_q83oOYtWAncuAk,22391
 reconcile/aus/aus_label_source.py,sha256=qoP8Fgxuu1tCuhG6ixCWve7Ll-KD6a79E2uLAmC0ifw,4184
-reconcile/aus/base.py,sha256=EMQJ3tJAiUbhwLB4mFpGUCGspNx-q8C3GpDQJXO5qrM,47486
+reconcile/aus/base.py,sha256=4VTHqc22IW1xyLCgxhUrSBDRsaF99RW3uzoQafTQDN4,49410
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/healthchecks.py,sha256=S8_KPn_zFiOo_wf5XlVmz-I3tUDYAim3EGSqiSPMvLQ,2707
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
 reconcile/aus/models.py,sha256=2e0IPHDJNSM4opqIJUGGxjXLF3zFyrBCAFWRJKjgEEQ,7371
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=gDl8NDFSj7Dz0x1o9q8fjMEM7IJS3H1jlnMRJzDGw4o,10015
+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/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -667,7 +667,7 @@ reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnY
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9pyNFZ1cNZFmDGBUah9vjpP0y9f9w,2810
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
-reconcile/utils/ocm/addons.py,sha256=8wVrt16i69KkXq1fQByVheSQRhrRELbuOHb7Tz9bKT0,1675
+reconcile/utils/ocm/addons.py,sha256=cofEAtnoBGKbtShSe3oAz9YbEuql1z6w_2FoNiBcFwA,6887
 reconcile/utils/ocm/base.py,sha256=GclZtCrPkPJmGP9HHvqIlV-8VXSKuaQTQJkA2pklN60,13817
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Nw9m-jgN3GHHCh6w9UOBbMV4rtS24_-Ep09jAWQ-_fE,7653
@@ -681,7 +681,7 @@ reconcile/utils/ocm/sre_capability_labels.py,sha256=-TUmTzvK5yu7qY8SUMGj6-684wa8
 reconcile/utils/ocm/status_board.py,sha256=fOuyzkykxU9Rr7zhW5VaY0Vkn8Ur-GxvElzb8No-DZg,2283
 reconcile/utils/ocm/subscriptions.py,sha256=4qSH8uF9JvFxiecVSV1Kh8-mPcGSTfTTK7In5qHz_2w,2568
 reconcile/utils/ocm/syncsets.py,sha256=zvji9qWvInIRTdoybMaM9-VUhq4L1VewWfWCQmp4urc,940
-reconcile/utils/ocm/upgrades.py,sha256=ZWDfg3VrmRGx7Re-JjecRjwmn7Rh-dsuLA3OljbCByg,6616
+reconcile/utils/ocm/upgrades.py,sha256=zrr_J9X2WIgnnW4hz5NCqdLq22jmoIAX82xKhz-_LY8,4910
 reconcile/utils/rosa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/rosa/rosa_cli.py,sha256=b7V3EgO4b4hOnvZzrxdn-bxRbkINQysOg_ecuB8l5GA,11364
 reconcile/utils/rosa/session.py,sha256=jYJ0QsJv0mgV15MQIrfTuk2arscmgO4zkBhKcwyO5qo,6915
@@ -712,7 +712,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=0dbDYuRsD62Ih4CDAgQdOfluiH4nDc2ZuLwhfXJ7Mmk,111316
+tools/qontract_cli.py,sha256=fxXsgjmLBzC1zDkmNnB5jfOnwL-kGci5xC_4BsoIe3M,111648
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -724,8 +724,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 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.1rc692.dist-info/METADATA,sha256=rPd-SvnaH7o7slCI80SYYlaOExFVCSs3PEkK0k0WXfE,2382
-qontract_reconcile-0.10.1rc692.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc692.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc692.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc692.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc694.dist-info/METADATA,sha256=cJGxg2IBbK-ByqiYdq5k4iFEqTyNRhmB3W8V5a1a_II,2382
+qontract_reconcile-0.10.1rc694.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc694.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc694.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc694.dist-info/RECORD,,

reconcile/aus/base.py

@@ -8,6 +8,7 @@ from abc import (
 from datetime import (
     datetime,
     timedelta,
+    timezone,
 )
 from typing import (
     Callable,
@@ -74,6 +75,7 @@ from reconcile.utils.clusterhealth.telemeter import (
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 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,
@@ -81,14 +83,11 @@ from reconcile.utils.ocm.clusters import (
 )
 from reconcile.utils.ocm.upgrades import (
     OCMVersionGate,
-    create_addon_upgrade_policy,
     create_control_plane_upgrade_policy,
     create_node_pool_upgrade_policy,
     create_upgrade_policy,
-    delete_addon_upgrade_policy,
     delete_control_plane_upgrade_policy,
     delete_upgrade_policy,
-    get_addon_upgrade_policies,
     get_control_plane_upgrade_policies,
     get_node_pool_upgrade_policies,
     get_upgrade_policies,
@@ -365,6 +364,34 @@ class AdvancedUpgradeSchedulerBaseIntegration(
         return None
 
 
+def init_addon_service(ocm_env: OCMEnvironment) -> AddonService:
+    """
+    Initialize the right version of addon-service for an OCM environment.
+    Since this is just temporary until all OCM environments are on v2, we
+    use a label on the OCM environmentschema to determine which version to use.
+    """
+    addon_service_version = (ocm_env.labels or {}).get(
+        "feature_flag_addon_service_version"
+    ) or "v2"
+    return init_addon_service_version(addon_service_version)
+
+
+def init_addon_service_version(addon_service_version: str) -> AddonService:
+    """
+    Initialize the right version of addon-service based on the version string.
+    Supported versions are:
+    - v1: part of CS
+    - v2: standalone service using upgrade-plans instead of upgrade-policies
+    """
+    match addon_service_version:
+        case "v1":
+            return AddonServiceV1()
+        case "v2":
+            return AddonServiceV2()
+        case _:
+            raise ValueError(f"Unknown addon service version: {addon_service_version}")
+
+
 class RemainingSoakDayMetricsBuilder(Protocol):
     def __call__(
         self, cluster_uuid: str, soaking_version: str
@@ -397,27 +424,39 @@ class AbstractUpgradePolicy(ABC, BaseModel):
         pass
 
 
+def addon_upgrade_policy_soonest_next_run() -> str:
+    now = datetime.now(tz=timezone.utc)
+    next_run = now + timedelta(minutes=MIN_DELTA_MINUTES)
+    return next_run.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+
 class AddonUpgradePolicy(AbstractUpgradePolicy):
     """Class to create and delete Addon upgrade policies in OCM"""
 
     addon_id: str
+    addon_service: AddonService
+
+    class Config:
+        arbitrary_types_allowed = True
 
     def create(self, ocm_api: OCMBaseClient) -> None:
-        item = {
-            "version": self.version,
-            "schedule_type": "manual",
-            "addon_id": self.addon_id,
-            "cluster_id": self.cluster.id,
-            "upgrade_type": "ADDON",
-        }
-        create_addon_upgrade_policy(ocm_api, self.cluster.id, item)
+        self.addon_service.create_addon_upgrade_policy(
+            ocm_api=ocm_api,
+            cluster_id=self.cluster.id,
+            addon_id=self.addon_id,
+            schedule_type="manual",
+            version=self.version,
+            next_run=self.next_run or addon_upgrade_policy_soonest_next_run(),
+        )
 
     def delete(self, ocm_api: OCMBaseClient) -> None:
         if not self.id:
             raise ValueError(
                 "Cannot delete addon upgrade policy without id (not created yet)"
             )
-        delete_addon_upgrade_policy(ocm_api, self.cluster.id, self.id)
+        self.addon_service.delete_addon_upgrade_policy(
+            ocm_api=ocm_api, cluster_id=self.cluster.id, policy_id=self.id
+        )
 
     def summarize(self) -> str:
         details = {
@@ -452,7 +491,8 @@ class ClusterUpgradePolicy(AbstractUpgradePolicy):
         details = {
             "cluster": self.cluster.name,
             "cluster_id": self.cluster.id,
-            "version": self.version,
+            "from_version": self.cluster.version.raw_id,
+            "to_version": self.version,
             "next_run": self.next_run,
         }
         return f"cluster upgrade policy - {remove_none_values_from_dict(details)}"
@@ -543,15 +583,18 @@ def fetch_current_state(
     addons: bool = False,
 ) -> list[AbstractUpgradePolicy]:
     current_state: list[AbstractUpgradePolicy] = []
+    addon_service = init_addon_service(org_upgrade_spec.org.environment)
     for spec in org_upgrade_spec.specs:
         if addons and isinstance(spec, ClusterAddonUpgradeSpec):
             addon_spec = cast(ClusterAddonUpgradeSpec, spec)
-            upgrade_policies = get_addon_upgrade_policies(
+            upgrade_policies = addon_service.get_addon_upgrade_policies(
                 ocm_api, spec.cluster.id, addon_id=addon_spec.addon.addon.id
             )
             for upgrade_policy in upgrade_policies:
                 upgrade_policy["cluster"] = spec.cluster
-                current_state.append(AddonUpgradePolicy(**upgrade_policy))
+                current_state.append(
+                    AddonUpgradePolicy(**upgrade_policy, addon_service=addon_service)
+                )
         elif spec.cluster.is_rosa_hypershift():
             upgrade_policies = get_control_plane_upgrade_policies(
                 ocm_api, spec.cluster.id
@@ -1014,6 +1057,7 @@ def calculate_diff(
             for mutex in spec.effective_mutexes:
                 locked[mutex] = spec.cluster.id
 
+    addon_service = init_addon_service(desired_state.org.environment)
     now = datetime.utcnow()
     gates = get_version_gates(ocm_api)
     for spec in desired_state.specs:
@@ -1062,6 +1106,7 @@ def calculate_diff(
                             schedule_type="manual",
                             addon_id=addon_id,
                             upgrade_type="ADDON",
+                            addon_service=addon_service,
                         ),
                     )
                 )
@@ -1078,12 +1123,12 @@ def calculate_diff(
                 #
                 # this might change in the future - revisite for 4.16
                 if not minor_version_gates:
-                    logging.debug(
+                    logging.info(
                         f"[{spec.org.org_id}/{spec.org.name}/{spec.cluster.name}] no gates found for {target_version_prefix}. "
                         "Skip creation of an upgrade policy."
                     )
                     continue
-                gates = gates_to_agree(
+                gates_with_missing_agreements = gates_to_agree(
                     gates=minor_version_gates,
                     cluster=spec.cluster,
                     acked_gate_ids={
@@ -1091,10 +1136,12 @@ def calculate_diff(
                         for agreement in get_version_agreement(ocm_api, spec.cluster.id)
                     },
                 )
-                if gates:
-                    gate_ids = [gate.id for gate in gates]
+                if gates_with_missing_agreements:
+                    missing_gate_ids = [
+                        gate.id for gate in gates_with_missing_agreements
+                    ]
                     logging.info(
-                        f"[{spec.org.org_id}/{spec.org.name}/{spec.cluster.name}] found gates for {target_version_prefix} - {gate_ids} "
+                        f"[{spec.org.org_id}/{spec.org.name}/{spec.cluster.name}] found gates with missing agreements for {target_version_prefix} - {missing_gate_ids} "
                         "Skip creation of an upgrade policy until all of them have been acked by the version-gate-approver integration or a user."
                     )
                     continue

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -6,6 +6,7 @@ from reconcile.aus import base as aus
 from reconcile.aus.base import (
     AbstractUpgradePolicy,
     AddonUpgradePolicy,
+    init_addon_service,
 )
 from reconcile.aus.cluster_version_data import VersionData
 from reconcile.aus.healthchecks import (
@@ -26,8 +27,6 @@ from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.utils import metrics
 from reconcile.utils.ocm.addons import (
     OCMAddonInstallation,
-    get_addon_latest_versions,
-    get_addons_for_cluster,
 )
 from reconcile.utils.ocm.clusters import (
     OCMCluster,
@@ -137,15 +136,17 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
         if not organizations:
             return {}
 
+        addon_service = init_addon_service(ocm_env)
+
         # lookup cluster in OCM to figure out if they exist
         # and to get their UUID
         with init_ocm_base_client(ocm_env, self.secret_reader) as ocm_api:
             clusters = discover_clusters_for_organizations(
                 ocm_api, [org.org_id for org in organizations]
             )
-            addon_latest_versions = get_addon_latest_versions(ocm_api)
+            addon_latest_versions = addon_service.get_addon_latest_versions(ocm_api)
             addons_per_cluster: dict[str, list[OCMAddonInstallation]] = {
-                cluster.ocm_cluster.name: get_addons_for_cluster(
+                cluster.ocm_cluster.name: addon_service.get_addons_for_cluster(
                     ocm_api=ocm_api,
                     cluster_id=cluster.ocm_cluster.id,
                     addon_latest_versions=addon_latest_versions,
@@ -260,6 +261,9 @@ def calculate_diff(
                         id=current.id,
                         addon_id=current.addon_id,
                         schedule_type=current.schedule_type,
+                        addon_service=init_addon_service(
+                            org_upgrade_spec.org.environment
+                        ),
                     ),
                 )
             )

reconcile/cli.py

@@ -2469,6 +2469,7 @@ def ocm_addons_upgrade_scheduler_org(
     run_class_integration(
         integration=OCMAddonsUpgradeSchedulerOrgIntegration(
             AdvancedUpgradeSchedulerBaseIntegrationParams(
+                ocm_environment="ocm-integration",
                 ocm_organization_ids=set(org_id),
                 excluded_ocm_organization_ids=set(exclude_org_id),
             )

reconcile/queries.py

@@ -1280,6 +1280,7 @@ OCM_QUERY = """
     environment {
       name
       url
+      labels
       accessTokenClientId
       accessTokenUrl
       accessTokenClientSecret {

reconcile/utils/ocm/addons.py

@@ -6,46 +6,217 @@ from typing import (
 from reconcile.utils.ocm.base import OCMAddonInstallation
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
+ADDON_UPGRADE_POLICY_DESIRED_KEYS = {
+    "id",
+    "addon_id",
+    "schedule_type",
+    "schedule",
+    "next_run",
+    "version",
+}
 
-def get_addons_for_cluster(
-    ocm_api: OCMBaseClient,
-    cluster_id: str,
-    addon_latest_versions: dict[str, str],
-    required_state: Optional[str],
-) -> list[OCMAddonInstallation]:
-    """
-    Returns a list of Addons installed on a cluster
 
-    :param cluster_id: ID of the cluster
-    :param addon_latest_versions: dict of addon_id -> latest version. This allows us to
-        populate the addonsinstalation available upgrades in an efficient way.
-    :param required_state: only return addons with this state
+class AddonService:
+    def get_addon_latest_versions(self, ocm_api: OCMBaseClient) -> dict[str, str]:
+        """
+        Returns the latest version for each addon.
+        """
+        latest_versions: dict[str, str] = {}
+        for addon in ocm_api.get_paginated(f"{self.addon_base_api_path()}/addons"):
+            addon_id = addon["id"]
+            latest_versions[addon_id] = addon["version"]["id"]
+        return latest_versions
+
+    def get_addons_for_cluster(
+        self,
+        ocm_api: OCMBaseClient,
+        cluster_id: str,
+        addon_latest_versions: dict[str, str],
+        required_state: Optional[str],
+    ) -> list[OCMAddonInstallation]:
+        """
+        Returns a list of Addons installed on a cluster
+
+        :param cluster_id: ID of the cluster
+        :param addon_latest_versions: dict of addon_id -> latest version. This allows us to
+            populate the addonsinstalation available upgrades in an efficient way.
+        :param required_state: only return addons with this state
+        """
+
+        params: Optional[dict[str, Any]] = None
+        if required_state:
+            params = {"search": f"state='{required_state}'"}
+
+        addons = []
+        for addon in ocm_api.get_paginated(
+            api_path=f"{self.addon_base_api_path()}/clusters/{cluster_id}/addons",
+            params=params,
+        ):
+            current_version = addon["addon_version"]["id"]
+            latest_version = addon_latest_versions.get(addon["id"])
+            addon["addon_version"]["available_upgrades"] = (
+                [latest_version] if latest_version != current_version else []
+            )
+            addons.append(OCMAddonInstallation(**addon))
+        return addons
+
+    def addon_base_api_path(self) -> str:
+        raise NotImplementedError()
+
+    def get_addon_upgrade_policies(
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+    ) -> list[dict[str, Any]]:
+        raise NotImplementedError()
+
+    def create_addon_upgrade_policy(
+        self,
+        ocm_api: OCMBaseClient,
+        cluster_id: str,
+        addon_id: str,
+        schedule_type: str,
+        version: str,
+        next_run: str,
+    ) -> None:
+        raise NotImplementedError()
+
+    def delete_addon_upgrade_policy(
+        self, ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
+    ) -> None:
+        raise NotImplementedError()
+
+
+class AddonServiceV1(AddonService):
     """
+    The original addon-service API that is part of CS.
+    """
+
+    def addon_base_api_path(self) -> str:
+        return "/api/clusters_mgmt/v1"
+
+    def get_addon_upgrade_policies(
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+    ) -> list[dict[str, Any]]:
+        results: list[dict[str, Any]] = []
 
-    params: Optional[dict[str, Any]] = None
-    if required_state:
-        params = {"search": f"state='{required_state}'"}
-
-    addons = []
-    for addon in ocm_api.get_paginated(
-        api_path=f"/api/clusters_mgmt/v1/clusters/{cluster_id}/addons",
-        params=params,
-    ):
-        current_version = addon["addon_version"]["id"]
-        latest_version = addon_latest_versions.get(addon["id"])
-        addon["addon_version"]["available_upgrades"] = (
-            [latest_version] if latest_version != current_version else []
+        for policy in ocm_api.get_paginated(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies"
+        ):
+            if addon_id and policy["addon_id"] != addon_id:
+                continue
+            policy_data = {
+                k: v
+                for k, v in policy.items()
+                if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
+            }
+            policy_data["state"] = self._get_addon_upgrade_policy_state(
+                ocm_api, cluster_id, policy["id"]
+            )
+            results.append(policy_data)
+
+        return results
+
+    def _get_addon_upgrade_policy_state(
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_upgrade_policy_id: str
+    ) -> Optional[str]:
+        try:
+            state_data = ocm_api.get(
+                f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies/{addon_upgrade_policy_id}/state"
+            )
+            return state_data.get("value")
+        except Exception:
+            return None
+
+    def create_addon_upgrade_policy(
+        self,
+        ocm_api: OCMBaseClient,
+        cluster_id: str,
+        addon_id: str,
+        schedule_type: str,
+        version: str,
+        next_run: str,
+    ) -> None:
+        """
+        Creates a new Addon Upgrade Policy
+        """
+        spec = {
+            "version": version,
+            "schedule_type": schedule_type,
+            "addon_id": addon_id,
+            "cluster_id": cluster_id,
+            "upgrade_type": "ADDON",
+        }
+        ocm_api.post(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies",
+            spec,
         )
-        addons.append(OCMAddonInstallation(**addon))
-    return addons
 
+    def delete_addon_upgrade_policy(
+        self, ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
+    ) -> None:
+        """
+        Deletes an existing Addon Upgrade Policy
+        """
+        ocm_api.delete(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies/{policy_id}"
+        )
 
-def get_addon_latest_versions(ocm_api: OCMBaseClient) -> dict[str, str]:
+
+class AddonServiceV2(AddonService):
     """
-    Returns the latest version for each addon.
+    The dedicated addon-service API that is part of OCM.
     """
-    latest_versions: dict[str, str] = {}
-    for addon in ocm_api.get_paginated("/api/clusters_mgmt/v1/addons"):
-        addon_id = addon["id"]
-        latest_versions[addon_id] = addon["version"]["id"]
-    return latest_versions
+
+    def addon_base_api_path(self) -> str:
+        return "/api/addons_mgmt/v1"
+
+    def get_addon_upgrade_policies(
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+    ) -> list[dict[str, Any]]:
+        results: list[dict[str, Any]] = []
+
+        for policy in ocm_api.get_paginated(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan"
+        ):
+            if addon_id and policy["addon_id"] != addon_id:
+                continue
+            policy_data = {
+                k: v
+                for k, v in policy.items()
+                if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
+            }
+            results.append(policy_data)
+
+        return results
+
+    def create_addon_upgrade_policy(
+        self,
+        ocm_api: OCMBaseClient,
+        cluster_id: str,
+        addon_id: str,
+        schedule_type: str,
+        version: str,
+        next_run: str,
+    ) -> None:
+        """
+        Schedules an addon upgrade. Leverages addon-service upgrade plans behind the scene.
+        """
+        spec = {
+            "version": version,
+            "type": schedule_type,
+            "addon_id": addon_id,
+            "cluster_id": cluster_id,
+            "next_run": next_run,
+        }
+        ocm_api.post(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan", spec
+        )
+
+    def delete_addon_upgrade_policy(
+        self, ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
+    ) -> None:
+        """
+        Deletes an existing upgrade plan.
+        """
+        ocm_api.delete(
+            f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plan/{policy_id}"
+        )

reconcile/utils/ocm/upgrades.py

@@ -8,78 +8,12 @@ from reconcile.utils.ocm.base import OCMVersionGate
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
 UPGRADE_POLICY_DESIRED_KEYS = {"id", "schedule_type", "schedule", "next_run", "version"}
-ADDON_UPGRADE_POLICY_DESIRED_KEYS = {
-    "id",
-    "addon_id",
-    "schedule_type",
-    "schedule",
-    "next_run",
-    "version",
-}
 
 
 def build_cluster_url(cluster_id: str) -> str:
     return f"/api/clusters_mgmt/v1/clusters/{cluster_id}"
 
 
-#
-# ADDON UPGRADE POLICIES
-#
-
-
-def get_addon_upgrade_policies(
-    ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
-) -> list[dict[str, Any]]:
-    results: list[dict[str, Any]] = []
-
-    for policy in ocm_api.get_paginated(
-        f"{build_cluster_url(cluster_id)}/addon_upgrade_policies"
-    ):
-        if addon_id and policy["addon_id"] != addon_id:
-            continue
-        policy_data = {
-            k: v for k, v in policy.items() if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
-        }
-        policy_data["state"] = get_addon_upgrade_policy_state(
-            ocm_api, cluster_id, policy["id"]
-        )
-        results.append(policy_data)
-
-    return results
-
-
-def get_addon_upgrade_policy_state(
-    ocm_api: OCMBaseClient, cluster_id: str, addon_upgrade_policy_id: str
-) -> Optional[str]:
-    try:
-        state_data = ocm_api.get(
-            f"{build_cluster_url(cluster_id)}/addon_upgrade_policies/{addon_upgrade_policy_id}/state"
-        )
-        return state_data.get("value")
-    except Exception:
-        return None
-
-
-def create_addon_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, spec: dict
-) -> None:
-    """
-    Creates a new Addon Upgrade Policy
-    """
-    ocm_api.post(f"{build_cluster_url(cluster_id)}/addon_upgrade_policies", spec)
-
-
-def delete_addon_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
-) -> None:
-    """
-    Deletes an existing Addon Upgrade Policy
-    """
-    ocm_api.delete(
-        f"{build_cluster_url(cluster_id)}/addon_upgrade_policies/{policy_id}"
-    )
-
-
 #
 # UPGRADE POLICIES
 #

tools/qontract_cli.py

@@ -46,6 +46,8 @@ from reconcile.aus.base import (
     AbstractUpgradePolicy,
     AdvancedUpgradeSchedulerBaseIntegration,
     AdvancedUpgradeSchedulerBaseIntegrationParams,
+    addon_upgrade_policy_soonest_next_run,
+    init_addon_service_version,
 )
 from reconcile.aus.models import OrganizationUpgradeSpec
 from reconcile.change_owners.bundle import NoOpFileDiffResolver
@@ -834,7 +836,6 @@ def upgrade_cluster_addon(
     ocm_org: str, cluster: str, addon: str, dry_run: bool, force: bool
 ) -> None:
     import reconcile.aus.ocm_addons_upgrade_scheduler_org as oauso
-    from reconcile.utils.ocm.upgrades import create_addon_upgrade_policy
 
     settings = queries.get_app_interface_settings()
     ocms = queries.get_openshift_cluster_managers()
@@ -886,14 +887,21 @@ def upgrade_cluster_addon(
         )
     print(["create", ocm_org, cluster, addon, ocm_addon_version])
     if not dry_run:
-        spec = {
-            "version": ocm_addon_version,
-            "schedule_type": "manual",
-            "addon_id": addon,
-            "cluster_id": ocm.cluster_ids[cluster],
-            "upgrade_type": "ADDON",
-        }
-        create_addon_upgrade_policy(ocm._ocm_client, ocm.cluster_ids[cluster], spec)
+        # detection addon service version
+        ocm_env_labels = json.loads(ocm_info["environment"].get("labels") or "{}")
+        addon_service_version = (
+            ocm_env_labels.get("feature_flag_addon_service_version") or "v2"
+        )
+        addon_service = init_addon_service_version(addon_service_version)
+
+        addon_service.create_addon_upgrade_policy(
+            ocm_api=ocm._ocm_client,
+            cluster_id=ocm.cluster_ids[cluster],
+            addon_id=ocm_addon["id"],
+            schedule_type="manual",
+            version=ocm_addon_version,
+            next_run=addon_upgrade_policy_soonest_next_run(),
+        )
 
 
 def has_cluster_account_access(cluster: dict[str, Any]):