qontract-reconcile 0.9.1rc213__py3-none-any.whl → 0.9.1rc215__py3-none-any.whl

{qontract_reconcile-0.9.1rc213.dist-info → qontract_reconcile-0.9.1rc215.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ reconcile/aws_iam_password_reset.py,sha256=GDoBo4VFSABgRFjEfwRXlXlNGb7beVt5pSrNr
 reconcile/aws_support_cases_sos.py,sha256=i6bSWnlH9fh14P14PjVhFLwNl-q3fD733_rXKM_O51c,2992
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=figtZRuWUvdpdSnkhAqeGvO5dI02TT6J3heyeFhlwqM,5016
-reconcile/cli.py,sha256=aSm4aDGb80HXHrq7lYH1UMunoVrGo0F-a7-NgMWFmJg,71079
+reconcile/cli.py,sha256=k4NQ-Uu4EY50JkXK6QPAeCRo6vLzu49Al27vuAh4wuI,72161
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=0xg_d8dwd36Y8GY1mE-LLO1LQpPEMM77bzAfc_KdgzU,4870
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=Ca75-OQiu5HeA8Q6zQpEYuhyCSjeuWe99K4y9ipTORM,4032
@@ -132,12 +132,12 @@ reconcile/unleash_watcher.py,sha256=xNLUFpIr66XESEyXUkmHTTmHghVWHiMtnS_k0OC7gd8,
 reconcile/vault_replication.py,sha256=xobxnsOfUcwvdQ-RZ7JH_sZCDh8rpEY7MJ36nkvfFqE,17262
 reconcile/vpc_peerings_validator.py,sha256=10igLYTQpBMGXO9mTO7sJBzgr4jXQ2hf1OH5r5DKugE,3586
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/base.py,sha256=umMBJEUQNg-cwhHNprHkPX0mPBEyfSUvkpRDsHp_fYE,20466
-reconcile/aus/label_base_ocm_upgrade_scheduler_org.py,sha256=L8adHnFNtiiWJccJKEYkAZyVfsDy_oTKtqfAb30SfCE,602
+reconcile/aus/advanced_upgrade_service.py,sha256=O2LDgMbFYKsNuflh8b80sIr59WpJwFHSCeZtacMA6Kg,810
+reconcile/aus/base.py,sha256=xWqMCECr5_bYcMy2lQc5tO85i4nFJbUnKS5PvKtEoHM,21475
 reconcile/aus/models.py,sha256=uExdoZwGc1rdIhLSEBRxi6byvipo1rRGs1jfZyOykyg,486
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=dsyLW3gbfcvcO_C1o-35uw5qS_3EuDjOnV-PrMweiJA,5062
-reconcile/aus/ocm_upgrade_scheduler.py,sha256=JHDdO6lhhiH1Y-lKTjrnyKOIaujU-924-c-10nvlQGA,3161
-reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=7Q32TF01086wSk0vzz2wSDni_X_KnrjPO-mcCQecSf0,1405
+reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=d9ExfJmFnEKv0b_YIwghtGiywygxxUb_M2qMJGVvo3k,5086
+reconcile/aus/ocm_upgrade_scheduler.py,sha256=O5mv8bnNZ6WjPYSKOSnylYGhyYfIwwAXFzB62wnhqRM,3219
+reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=g7hLYRojxTUQybCKJHq5YLPb7bAE4eXH6oUmZFvuaFg,1429
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=L7XJWJ-rgn8BOmeMb6lBDV8lHFCUaNoHGDSD7OH03vA,2244
 reconcile/change_owners/bundle.py,sha256=2_GEcw40O4MOnPvynEJtfZIW01675uwRNeptP0unJ84,1793
@@ -180,6 +180,7 @@ reconcile/gql_definitions/common/clusters.py,sha256=qr8gnFH71pYUGijReg0NvaQ7LF8u
 reconcile/gql_definitions/common/clusters_minimal.py,sha256=iYnAPQ7jDtEu06XgkDlltXa2_iJsp56rIfDqEYef-uM,5257
 reconcile/gql_definitions/common/namespaces.py,sha256=HNu55aeBQUGr4JfjQFj8sGAE2SILh_TtTT6LmsHfwPo,9161
 reconcile/gql_definitions/common/namespaces_minimal.py,sha256=0n9f2ldd_aEN9tzcqKvtzZ53ceH-1v411vVkD8wPaeY,3539
+reconcile/gql_definitions/common/ocm_environments.py,sha256=yV4UVjdnNmqbR5trQCOAv5-UhatbT32R8JGU99GcU3U,1995
 reconcile/gql_definitions/common/pagerduty_instances.py,sha256=8NBHKRXg_OKG9NsJv6FOj8UVFcjkdJg-9E16ZqZIRPQ,2006
 reconcile/gql_definitions/common/pgp_reencryption_settings.py,sha256=tS68-tBBd7BJYmfTjtdTlxpABF3f_z9eJdtaKnyZc0Q,2305
 reconcile/gql_definitions/common/pipeline_providers.py,sha256=6GgiGxV4Y25VTlfmhunFO_isU0gHKfid4L0YH9AGf80,9398
@@ -352,6 +353,7 @@ reconcile/test/test_utils_ldap_client.py,sha256=THq8ZrjxgEBpMS-AhU_x8hcx65DD9u_I
 reconcile/test/test_utils_mr.py,sha256=KYnF8SY8ybBVqXLQu8K40ZGcO8wSEkOW4PIS8RexLGQ,6622
 reconcile/test/test_utils_mr_clusters_updates.py,sha256=HZi70vg60huxjGKpasR07Ap0tYag_kJCFQQfxqi9LAU,2333
 reconcile/test/test_utils_oc.py,sha256=fhwghPVhJme1c6y293oo5GuJxYEQRQuyaZx1Aim5LxY,33674
+reconcile/test/test_utils_oc_native.py,sha256=gM49PCaM4NPXPlnj1OcXU0PdTcFnbamPFq0IWqHVEyw,1451
 reconcile/test/test_utils_ocm.py,sha256=aHqEDIplmuUbLeQvu_ED35XGmvkoNJjlQa_M1p9dA20,14158
 reconcile/test/test_utils_ocm_versions.py,sha256=8evUvlMmUTm6vMyrdnC3C4flzJ4hkWSluD01lC8eHLk,1862
 reconcile/test/test_utils_pagerduty_api.py,sha256=nGudGdVgruBRh1btuJ28CFaJTFqchHfsp2JnXY-_5Oo,7827
@@ -427,11 +429,11 @@ reconcile/utils/ldap_client.py,sha256=atreTLA1f7gnG54Ub3JWkToP9tCwAci-q17dqB5XSh
 reconcile/utils/lean_terraform_client.py,sha256=PJio087h5zUoievA3SppDP_io6ypiS9refaN5Hpm1Dg,1055
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=7DO12hEJ7sNOjrTNmA24l5wmAe4MT0WgY-Y2iPhBgXI,2015
-reconcile/utils/oc.py,sha256=I-xwIjvV0exXFOK7bIx3SaRfpsK-c-gubnbWhacrdkA,64465
+reconcile/utils/oc.py,sha256=Y0hu3i2pBi9qXGGnvyRl7JM3Op5AR6kfw1VA96QN5aM,68094
 reconcile/utils/oc_connection_parameters.py,sha256=jlEMObRAx0NuWQfEF7NXkLoY-Ewrr9egA7nUr_oUHyM,10011
 reconcile/utils/oc_filters.py,sha256=RWn8pC5A7ZZT7C6WPq9bOw5KBNkiAb5puFSr_FpdAf8,1358
 reconcile/utils/oc_map.py,sha256=2y8A2B7iSNG4dTxaF9OkKlbw0DYcUwjeF3uv-P0lTBM,9538
-reconcile/utils/ocm_base_client.py,sha256=79FkWLrSgqgFOYofiCo8H4ACThwUio8UFyLzlmC0FK4,4924
+reconcile/utils/ocm_base_client.py,sha256=858MkZXwqjinwRHhz7BPB42djbL_M-m287cesjCGycU,4964
 reconcile/utils/openshift_resource.py,sha256=ezJPf8udfc5e8LFDrCNqzV5y37i6hib0xAW1uZMMq_0,23599
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
 reconcile/utils/output.py,sha256=htcMXMe0y2dNnwu8MW8x0JZ5YBaEJRy5w4tR8yLF0OU,1738
@@ -504,7 +506,7 @@ release/test_version.py,sha256=jOMn3Qx-mZC5pnJR0LU9ieIdNaYZSmr1kQ6aCkPngAU,2053
 release/version.py,sha256=Ud36t9FxGHLubMrE2o5aaaZRGB9_9hU_z0RN9go0TQM,3876
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_reporter.py,sha256=DIWu0dpBDk_cBweaf2Qun5HnyrLER1bu-pv3kHM5YGY,21861
-tools/qontract_cli.py,sha256=KH7_tx7Uf-x25DxIHM92onaePnfMi2z44V1_0EBZZ1A,83840
+tools/qontract_cli.py,sha256=CUbL1ugBlfjs-r5zU2TGeuaYcUYkiuRdo480b_tBMBU,85495
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=JryinrDdvztN931enUY3FuDeLVnfs6y58mnK7itNK6Y,4940
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
@@ -512,8 +514,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc213.dist-info/METADATA,sha256=eHJZam1c3MqW9K_ZVNUqAw04bWlWvXg4Ch6EvFfNot4,2248
-qontract_reconcile-0.9.1rc213.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc213.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc213.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc213.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc215.dist-info/METADATA,sha256=dnTK7jCNUEBuvm2p53Ix4upIX4FuUEezQQ7gXrtCP2k,2248
+qontract_reconcile-0.9.1rc215.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc215.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc215.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc215.dist-info/RECORD,,

reconcile/aus/{label_base_ocm_upgrade_scheduler_org.py → advanced_upgrade_service.py}

@@ -4,13 +4,18 @@ from reconcile.aus.models import OrganizationUpgradeSpec
 from reconcile.aus.ocm_upgrade_scheduler_org import (
     OCMClusterUpgradeSchedulerOrgIntegration,
 )
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 
+QONTRACT_INTEGRATION = "advanced-upgrade-scheduler"
 
-class LabelBasedOCMClusterUpgradeSchedulerOrgIntegration(
-    OCMClusterUpgradeSchedulerOrgIntegration
-):
-    def get_organization_upgrade_spec(
-        self, org_name: Optional[str] = None
+
+class AdvancedUpgradeServiceIntegration(OCMClusterUpgradeSchedulerOrgIntegration):
+    @property
+    def name(self) -> str:
+        return QONTRACT_INTEGRATION
+
+    def get_ocm_env_upgrade_specs(
+        self, ocm_env: OCMEnvironment, org_name: Optional[str] = None
     ) -> dict[str, OrganizationUpgradeSpec]:
         return {
             # todo

reconcile/aus/base.py

@@ -17,6 +17,11 @@ from croniter import croniter
 from semver import VersionInfo
 
 from reconcile.aus.models import OrganizationUpgradeSpec
+from reconcile.gql_definitions.common.ocm_environments import (
+    query as ocm_environment_query,
+)
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
+from reconcile.utils import gql
 from reconcile.utils.cluster_version_data import (
     VersionData,
     WorkloadHistory,
@@ -29,7 +34,7 @@ from reconcile.utils.ocm import (
     Sector,
 )
 from reconcile.utils.runtime.integration import (
-    NoParams,
+    PydanticRunParams,
     QontractReconcileIntegration,
 )
 from reconcile.utils.semver_helper import (
@@ -39,20 +44,43 @@ from reconcile.utils.semver_helper import (
 from reconcile.utils.state import init_state
 
 
-class AdvancedUpgradeSchedulerBaseIntegration(QontractReconcileIntegration[NoParams]):
+class AdvancedUpgradeSchedulerBaseIntegrationParams(PydanticRunParams):
+
+    ocm_environment: Optional[str] = None
+    ocm_organization: Optional[str] = None
+
+
+class AdvancedUpgradeSchedulerBaseIntegration(
+    QontractReconcileIntegration[AdvancedUpgradeSchedulerBaseIntegrationParams]
+):
     def run(self, dry_run: bool) -> None:
-        upgrade_specs_per_org = self.get_organization_upgrade_spec()
-        if not upgrade_specs_per_org:
-            logging.debug("No upgrade policy definitions found")
-            sys.exit(0)
-
-        for org_name, org_upgrade_spec in upgrade_specs_per_org.items():
-            if org_upgrade_spec.specs:
-                self.process_upgrade_policies_in_org(dry_run, org_upgrade_spec)
-            else:
-                logging.debug(
-                    f"Skip org {org_name} because it defines no upgrade policies"
-                )
+        upgrade_specs = self.get_upgrade_specs()
+        for ocm_env, env_upgrade_specs in upgrade_specs.items():
+            for org_name, org_upgrade_spec in env_upgrade_specs.items():
+                if org_upgrade_spec.specs:
+                    self.process_upgrade_policies_in_org(dry_run, org_upgrade_spec)
+                else:
+                    logging.debug(
+                        f"Skip org {org_name} in {ocm_env} because it defines no upgrade policies"
+                    )
+        sys.exit(0)
+
+    def get_upgrade_specs(self) -> dict[str, dict[str, OrganizationUpgradeSpec]]:
+        return {
+            ocm_env.name: self.get_ocm_env_upgrade_specs(
+                ocm_env,
+                self.params.ocm_organization,
+            )
+            for ocm_env in self.get_ocm_environments()
+        }
+
+    def get_ocm_environments(self) -> list[OCMEnvironment]:
+        return ocm_environment_query(
+            gql.get_api().query,
+            variables={"name": self.params.ocm_environment}
+            if self.params.ocm_environment
+            else None,
+        ).environments
 
     @abstractmethod
     def process_upgrade_policies_in_org(
@@ -61,8 +89,8 @@ class AdvancedUpgradeSchedulerBaseIntegration(QontractReconcileIntegration[NoPar
         ...
 
     @abstractmethod
-    def get_organization_upgrade_spec(
-        self, org_name: Optional[str] = None
+    def get_ocm_env_upgrade_specs(
+        self, ocm_env: OCMEnvironment, org_name: Optional[str] = None
     ) -> dict[str, OrganizationUpgradeSpec]:
         ...
 

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -14,6 +14,7 @@ from reconcile.aus.models import (
 from reconcile.gql_definitions.advanced_upgrade_service.aus_organization import (
     query as aus_organizations_query,
 )
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.utils import gql
 from reconcile.utils.cluster_version_data import VersionData
 from reconcile.utils.ocm import OCMMap
@@ -58,10 +59,27 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
             )
             aus.act(dry_run, diffs, ocm_map, addon_id=addon_state.addon_id)
 
-    def get_organization_upgrade_spec(
-        self, org_name: Optional[str] = None
+    def get_ocm_env_upgrade_specs(
+        self, ocm_env: OCMEnvironment, org_name: Optional[str] = None
     ) -> dict[str, OrganizationUpgradeSpec]:
-        return organization_upgrade_spec(org_name=org_name)
+        return {
+            org.name: OrganizationUpgradeSpec(
+                org=org,
+                specs=[
+                    ClusterUpgradeSpec(
+                        name=cluster.name,
+                        ocm=org,
+                        upgradePolicy=cluster.upgrade_policy,
+                    )
+                    for cluster in org.upgrade_policy_clusters or []
+                ],
+            )
+            for org in aus_organizations_query(
+                query_func=gql.get_api().query
+            ).organizations
+            or []
+            if org.addon_managed_upgrades and (org_name is None or org.name == org_name)
+        }
 
 
 def get_state_for_org_spec(
@@ -110,27 +128,6 @@ def get_state_for_org_spec_per_addon(
     return ocm_map, result
 
 
-def organization_upgrade_spec(
-    org_name: Optional[str] = None,
-) -> dict[str, OrganizationUpgradeSpec]:
-    return {
-        org.name: OrganizationUpgradeSpec(
-            org=org,
-            specs=[
-                ClusterUpgradeSpec(
-                    name=cluster.name,
-                    ocm=org,
-                    upgradePolicy=cluster.upgrade_policy,
-                )
-                for cluster in org.upgrade_policy_clusters or []
-            ],
-        )
-        for org in aus_organizations_query(query_func=gql.get_api().query).organizations
-        or []
-        if org.addon_managed_upgrades and (org_name is None or org.name == org_name)
-    }
-
-
 def calculate_diff(
     addon_current_state: list[dict[str, Any]],
     addon_desired_state: list[dict[str, Any]],

reconcile/aus/ocm_upgrade_scheduler.py

@@ -10,6 +10,7 @@ from reconcile.aus.models import (
 from reconcile.gql_definitions.advanced_upgrade_service.aus_clusters import (
     query as aus_clusters_query,
 )
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.utils import gql
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import (
@@ -59,38 +60,34 @@ class OCMClusterUpgradeSchedulerIntegration(
         )
         aus.act(dry_run, diffs, ocm_map)
 
-    def get_organization_upgrade_spec(
-        self, org_name: Optional[str] = None
+    def get_ocm_env_upgrade_specs(
+        self, ocm_env: OCMEnvironment, org_name: Optional[str] = None
     ) -> dict[str, OrganizationUpgradeSpec]:
-        return organization_upgrade_spec(org_name=org_name)
-
-
-def organization_upgrade_spec(
-    org_name: Optional[str] = None,
-) -> dict[str, OrganizationUpgradeSpec]:
-    specs_per_org: dict[str, list[ClusterUpgradeSpec]] = defaultdict(list)
-    for cluster in aus_clusters_query(query_func=gql.get_api().query).clusters or []:
-        supported_product = (
-            cluster.spec and cluster.spec.product in SUPPORTED_OCM_PRODUCTS
-        )
-        in_org_shard = org_name is None or (
-            cluster.ocm and cluster.ocm.name == org_name
-        )
-        if (
-            integration_is_enabled(QONTRACT_INTEGRATION, cluster)
-            and cluster.ocm
-            and cluster.upgrade_policy
-            and supported_product
-            and in_org_shard
+        specs_per_org: dict[str, list[ClusterUpgradeSpec]] = defaultdict(list)
+        for cluster in (
+            aus_clusters_query(query_func=gql.get_api().query).clusters or []
         ):
-            specs_per_org[cluster.ocm.name].append(
-                ClusterUpgradeSpec(
-                    name=cluster.name,
-                    ocm=cluster.ocm,
-                    upgradePolicy=cluster.upgrade_policy,
-                )
+            supported_product = (
+                cluster.spec and cluster.spec.product in SUPPORTED_OCM_PRODUCTS
+            )
+            in_org_shard = org_name is None or (
+                cluster.ocm and cluster.ocm.name == org_name
             )
-    return {
-        org_name: OrganizationUpgradeSpec(org=specs[0].ocm, specs=specs)
-        for org_name, specs in specs_per_org.items()
-    }
+            if (
+                integration_is_enabled(QONTRACT_INTEGRATION, cluster)
+                and cluster.ocm
+                and cluster.upgrade_policy
+                and supported_product
+                and in_org_shard
+            ):
+                specs_per_org[cluster.ocm.name].append(
+                    ClusterUpgradeSpec(
+                        name=cluster.name,
+                        ocm=cluster.ocm,
+                        upgradePolicy=cluster.upgrade_policy,
+                    )
+                )
+        return {
+            org_name: OrganizationUpgradeSpec(org=specs[0].ocm, specs=specs)
+            for org_name, specs in specs_per_org.items()
+        }

reconcile/aus/ocm_upgrade_scheduler_org.py

@@ -8,6 +8,7 @@ from reconcile.aus.ocm_upgrade_scheduler import OCMClusterUpgradeSchedulerIntegr
 from reconcile.gql_definitions.advanced_upgrade_service.aus_organization import (
     query as aus_organizations_query,
 )
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.utils import gql
 
 QONTRACT_INTEGRATION = "ocm-upgrade-scheduler-org"
@@ -18,28 +19,24 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
     def name(self) -> str:
         return QONTRACT_INTEGRATION
 
-    def get_organization_upgrade_spec(
-        self, org_name: Optional[str] = None
+    def get_ocm_env_upgrade_specs(
+        self, ocm_env: OCMEnvironment, org_name: Optional[str] = None
     ) -> dict[str, OrganizationUpgradeSpec]:
-        return organization_upgrade_spec(org_name=org_name)
-
-
-def organization_upgrade_spec(
-    org_name: Optional[str] = None,
-) -> dict[str, OrganizationUpgradeSpec]:
-    return {
-        org.name: OrganizationUpgradeSpec(
-            org=org,
-            specs=[
-                ClusterUpgradeSpec(
-                    name=cluster.name,
-                    ocm=org,
-                    upgradePolicy=cluster.upgrade_policy,
-                )
-                for cluster in org.upgrade_policy_clusters or []
-            ],
-        )
-        for org in aus_organizations_query(query_func=gql.get_api().query).organizations
-        or []
-        if org_name is None or org.name == org_name
-    }
+        return {
+            org.name: OrganizationUpgradeSpec(
+                org=org,
+                specs=[
+                    ClusterUpgradeSpec(
+                        name=cluster.name,
+                        ocm=org,
+                        upgradePolicy=cluster.upgrade_policy,
+                    )
+                    for cluster in org.upgrade_policy_clusters or []
+                ],
+            )
+            for org in aus_organizations_query(
+                query_func=gql.get_api().query
+            ).organizations
+            or []
+            if org_name is None or org.name == org_name
+        }

reconcile/cli.py

@@ -29,7 +29,6 @@ from reconcile.utils.runtime.environment import init_env
 from reconcile.utils.runtime.integration import (
     ModuleArgsKwargsRunParams,
     ModuleBasedQontractReconcileIntegration,
-    NoParams,
     QontractReconcileIntegration,
 )
 from reconcile.utils.runtime.meta import IntegrationMeta
@@ -1958,11 +1957,14 @@ def ocm_machine_pools(ctx, thread_pool_size):
 @environ(["APP_INTERFACE_STATE_BUCKET", "APP_INTERFACE_STATE_BUCKET_ACCOUNT"])
 @click.pass_context
 def ocm_upgrade_scheduler(ctx):
-    import reconcile.aus.ocm_upgrade_scheduler
+    from reconcile.aus.base import AdvancedUpgradeSchedulerBaseIntegrationParams
+    from reconcile.aus.ocm_upgrade_scheduler import (
+        OCMClusterUpgradeSchedulerIntegration,
+    )
 
     run_class_integration(
-        integration=reconcile.aus.ocm_upgrade_scheduler.OCMClusterUpgradeSchedulerIntegration(
-            NoParams()
+        integration=OCMClusterUpgradeSchedulerIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams()
         ),
         ctx=ctx.obj,
     )
@@ -1972,11 +1974,16 @@ def ocm_upgrade_scheduler(ctx):
 @environ(["APP_INTERFACE_STATE_BUCKET", "APP_INTERFACE_STATE_BUCKET_ACCOUNT"])
 @click.pass_context
 def ocm_upgrade_scheduler_org(ctx):
-    import reconcile.aus.ocm_upgrade_scheduler_org
+    from reconcile.aus.base import AdvancedUpgradeSchedulerBaseIntegrationParams
+    from reconcile.aus.ocm_upgrade_scheduler_org import (
+        OCMClusterUpgradeSchedulerOrgIntegration,
+    )
 
     run_class_integration(
-        integration=reconcile.aus.ocm_upgrade_scheduler_org.OCMClusterUpgradeSchedulerOrgIntegration(
-            NoParams()
+        integration=OCMClusterUpgradeSchedulerOrgIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams(
+                # pass in env or org here for sharding
+            )
         ),
         ctx=ctx.obj,
     )
@@ -2001,11 +2008,32 @@ def ocm_upgrade_scheduler_org_updater(ctx, gitlab_project_id):
 @click.pass_context
 def ocm_addons_upgrade_scheduler_org(ctx):
 
-    import reconcile.aus.ocm_addons_upgrade_scheduler_org
+    from reconcile.aus.base import AdvancedUpgradeSchedulerBaseIntegrationParams
+    from reconcile.aus.ocm_addons_upgrade_scheduler_org import (
+        OCMAddonsUpgradeSchedulerOrgIntegration,
+    )
+
+    run_class_integration(
+        integration=OCMAddonsUpgradeSchedulerOrgIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams()
+        ),
+        ctx=ctx.obj,
+    )
+
+
+@integration.command(
+    short_help="Manage Cluster Upgrade Policy schedules in OCM organizations based on OCM labels."
+)
+@environ(["APP_INTERFACE_STATE_BUCKET", "APP_INTERFACE_STATE_BUCKET_ACCOUNT"])
+@click.pass_context
+def aus_upgrade_scheduler_org(ctx):
+
+    from reconcile.aus.advanced_upgrade_service import AdvancedUpgradeServiceIntegration
+    from reconcile.aus.base import AdvancedUpgradeSchedulerBaseIntegrationParams
 
     run_class_integration(
-        integration=reconcile.aus.ocm_addons_upgrade_scheduler_org.OCMAddonsUpgradeSchedulerOrgIntegration(
-            NoParams()
+        integration=AdvancedUpgradeServiceIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams()
         ),
         ctx=ctx.obj,
     )

reconcile/gql_definitions/common/ocm_environments.py

@@ -0,0 +1,75 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
+
+
+DEFINITION = """
+fragment OCMEnvironment on OpenShiftClusterManagerEnvironment_v1 {
+    name
+    url
+    accessTokenClientId
+    accessTokenUrl
+    accessTokenClientSecret {
+        ... VaultSecret
+    }
+}
+
+fragment VaultSecret on VaultSecret_v1 {
+    path
+    field
+    version
+    format
+}
+
+query OCMEnvironments($name: String) {
+  environments: ocm_environments_v1(name: $name) {
+    ... OCMEnvironment
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union = True
+        extra = Extra.forbid
+
+
+class OCMEnvironmentsQueryData(ConfiguredBaseModel):
+    environments: list[OCMEnvironment] = Field(..., alias="environments")
+
+
+def query(query_func: Callable, **kwargs: Any) -> OCMEnvironmentsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        OCMEnvironmentsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return OCMEnvironmentsQueryData(**raw_data)

reconcile/test/test_utils_oc_native.py

@@ -0,0 +1,58 @@
+import json
+import os
+from unittest import TestCase
+from unittest.mock import patch
+
+from reconcile.test.fixtures import Fixtures
+from reconcile.utils.oc import (
+    OC,
+    ApiClient,
+    StatusCodeError,
+)
+
+fixture = Fixtures("oc_native").get_anymarkup("api.yml")
+
+
+class RespMock:
+    def __init__(self, data):
+        self.data = json.dumps(data).encode()
+
+
+def request(
+    method,
+    url,
+    query_params=None,
+    headers=None,
+    post_params=None,
+    body=None,
+    _preload_content=True,
+    _request_timeout=None,
+):
+    url_list = url.split("/", 1)
+    cluster = fixture.get(url_list[0])
+    data = cluster.get(url_list[1], None)
+    return RespMock(data)
+
+
+class TestOCNative(TestCase):
+    @patch.dict(os.environ, {"USE_NATIVE_CLIENT": "True"}, clear=True)
+    @patch.object(ApiClient, "request")
+    def test_oc_native(self, mock_request):
+        mock_request.side_effect = request
+
+        oc = OC("cluster", "server", "token", init_projects=True, local=True)
+
+        expected = fixture["projects"]
+        self.assertEqual(oc.projects, expected)
+
+        kind = "Project.config.openshift.io"
+        _k, group_version = oc._parse_kind(kind)
+        self.assertEqual(group_version, "config.openshift.io/v1")
+
+        kind = "Test"
+        with self.assertRaises(StatusCodeError):
+            oc._parse_kind(kind)
+
+        kind = "Project.test.io"
+        with self.assertRaises(StatusCodeError):
+            oc._parse_kind(kind)

reconcile/utils/oc.py

@@ -30,6 +30,7 @@ from kubernetes.client import (
     ApiClient,
     Configuration,
 )
+from kubernetes.client.exceptions import ApiException
 from kubernetes.dynamic.client import DynamicClient
 from kubernetes.dynamic.discovery import (
     LazyDiscoverer,
@@ -1291,6 +1292,46 @@ class OCNative(OCDeprecated):
             )
         return self.object_clients[key]
 
+    # this function returns a kind:Resource for each kind on the
+    # cluster
+    def get_api_resources(self):
+        c_res = self.client.resources
+        # this returns a prefix:apis map
+        apis = c_res.parse_api_groups(request_resources=False, update=True)
+        api_resources = {}
+        for prefix, api_groups in apis.items():
+            # each api prefix consists of api:versions map
+            for group, versions in api_groups.items():
+                if prefix == "apis" and len(group) == 0:
+                    # the apis group has an entry with an empty api, but
+                    # querying the apis group with a blank api produces an
+                    # error.  We skip that condition with this hack
+                    continue
+                # each version is a version:resource_group map, where resource_group
+                # contains if this api version is preferred and optionally a list of
+                # kinds that are part of that apigroup/version.
+                for version, resource_group in versions.items():
+                    try:
+                        resource_list = c_res.get_resources_for_api_version(
+                            prefix, group, version, True
+                        )
+                    except ApiException:
+                        # there may be apigroups/versions that require elevated
+                        # permisions, so go to the next one
+                        continue
+                    # resources is a map containing kind:Resource and
+                    # {kind}List:ResourceList where a Resource contains the api
+                    # group_version (group/api_version) and a ResourceList
+                    # represents a list of API objects
+                    for kind, resources in resource_list.items():
+                        for r in resources:
+                            if isinstance(r, ResourceList):
+                                continue
+                            api_resources = self.add_api_resource(
+                                kind, api_resources, resource_group.preferred, r
+                            )
+        return api_resources
+
     @retry(max_attempts=5, exceptions=(ServerTimeoutError))
     def get_items(self, kind, **kwargs):
         k, group_version = self._parse_kind(kind)
@@ -1357,6 +1398,42 @@ class OCNative(OCDeprecated):
         except NotFoundError as e:
             raise StatusCodeError(f"[{self.server}]: {e}")
 
+    @staticmethod
+    def add_api_resource(kind, api_resources, preferred, resource):
+        new_api_resources = copy.copy(api_resources)
+
+        if kind not in api_resources:
+            # this is a new kind so add it
+            new_api_resources[kind] = [resource]
+        else:
+            # this kind already exists, so check if this apigroup has
+            # already been added as an option.  If this apigroup/version is the
+            # preferred one, then replace the apigroup/version so that the
+            # preferred apigroup/version is used instead of a non-preferred one
+            # group = resource.group_version.split("/", 1)[0]
+            new_group = True
+            for pos in range(len(api_resources[kind])):
+                if resource.group == api_resources[kind][pos].group:
+                    new_group = False
+                    if preferred:
+                        new_api_resources[kind][pos] = resource
+                    break
+
+            if new_group:
+                # this is a new apigroup
+                new_api_resources[kind].append(resource)
+        return new_api_resources
+
+    def is_kind_supported(self, kind: str) -> bool:
+        if "." in kind:
+            try:
+                self._parse_kind(kind)
+                return True
+            except StatusCodeError:
+                return False
+        else:
+            return kind in (self.api_resources or {})
+
 
 OCClient = Union[OCNative, OCDeprecated]
 

reconcile/utils/ocm_base_client.py

@@ -155,7 +155,10 @@ class OCMAPIClientConfiguration(Protocol):
     url: str
     access_token_client_id: str
     access_token_url: str
-    access_token_client_secret: HasSecret
+
+    @property
+    def access_token_client_secret(self) -> HasSecret:
+        ...
 
 
 def init_ocm_base_client(

tools/qontract_cli.py

@@ -22,6 +22,10 @@ import reconcile.terraform_resources as tfr
 import reconcile.terraform_users as tfu
 import reconcile.terraform_vpc_peerings as tfvpc
 from reconcile import queries
+from reconcile.aus.base import (
+    AdvancedUpgradeSchedulerBaseIntegration,
+    AdvancedUpgradeSchedulerBaseIntegrationParams,
+)
 from reconcile.change_owners.bundle import NoOpFileDiffResolver
 from reconcile.change_owners.change_owners import (
     fetch_change_type_processors,
@@ -295,6 +299,9 @@ def get_upgrade_policies_data(
     show_only_soaking_upgrades=False,
     by_workload=False,
 ):
+    if not clusters:
+        return []
+
     settings = queries.get_app_interface_settings()
     ocm_map = OCMMap(
         clusters=clusters,
@@ -467,14 +474,38 @@ def cluster_upgrade_policies(
     show_only_soaking_upgrades=False,
     by_workload=False,
 ):
-    import reconcile.aus.ocm_upgrade_scheduler as ous
+    from reconcile.aus.ocm_upgrade_scheduler import (
+        OCMClusterUpgradeSchedulerIntegration,
+    )
+
+    integration = OCMClusterUpgradeSchedulerIntegration(
+        AdvancedUpgradeSchedulerBaseIntegrationParams()
+    )
+    generate_cluster_upgrade_policies_report(
+        ctx,
+        integration=integration,
+        cluster=cluster,
+        workload=workload,
+        show_only_soaking_upgrades=show_only_soaking_upgrades,
+        by_workload=by_workload,
+    )
+
 
+def generate_cluster_upgrade_policies_report(
+    ctx,
+    integration: AdvancedUpgradeSchedulerBaseIntegration,
+    cluster: Optional[str],
+    workload: Optional[str],
+    show_only_soaking_upgrades: bool,
+    by_workload: bool,
+) -> None:
     md_output = ctx.obj["options"]["output"] == "md"
 
-    upgrade_policies_per_org = ous.organization_upgrade_spec()
+    upgrade_specs = integration.get_upgrade_specs()
     clusters = [
         s.dict(by_alias=True)
-        for org_upgrade_spec in upgrade_policies_per_org.values()
+        for org_upgrade_specs in upgrade_specs.values()
+        for org_upgrade_spec in org_upgrade_specs.values()
         for s in org_upgrade_spec.specs
     ]
 
@@ -488,7 +519,7 @@ def cluster_upgrade_policies(
     results = get_upgrade_policies_data(
         clusters,
         md_output,
-        ous.QONTRACT_INTEGRATION,
+        integration.name,
         workload,
         show_only_soaking_upgrades,
         by_workload,
@@ -560,23 +591,55 @@ def inherit_version_data_text(ocm_org: str, ocm_specs: list[dict]) -> str:
 def ocm_fleet_upgrade_policies(
     ctx,
 ):
-    import reconcile.aus.ocm_upgrade_scheduler_org as ouso
+    from reconcile.aus.ocm_upgrade_scheduler_org import (
+        OCMClusterUpgradeSchedulerOrgIntegration,
+    )
+
+    generate_fleet_upgrade_policices_report(
+        ctx,
+        OCMClusterUpgradeSchedulerOrgIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams()
+        ),
+    )
+
+
+@get.command()
+@click.pass_context
+def aus_fleet_upgrade_policies(
+    ctx,
+):
+    from reconcile.aus.advanced_upgrade_service import AdvancedUpgradeServiceIntegration
+
+    generate_fleet_upgrade_policices_report(
+        ctx,
+        AdvancedUpgradeServiceIntegration(
+            AdvancedUpgradeSchedulerBaseIntegrationParams()
+        ),
+    )
+
+
+def generate_fleet_upgrade_policices_report(
+    ctx, aus_integration: AdvancedUpgradeSchedulerBaseIntegration
+):
 
     md_output = ctx.obj["options"]["output"] == "md"
 
-    upgrade_policies_per_org = ouso.organization_upgrade_spec()
+    upgrade_specs = aus_integration.get_upgrade_specs()
     upgrade_policies = [
         s.dict(by_alias=True)
-        for org_upgrade_spec in upgrade_policies_per_org.values()
+        for org_upgrade_specs in upgrade_specs.values()
+        for org_upgrade_spec in org_upgrade_specs.values()
         for s in org_upgrade_spec.specs
     ]
+
     ocm_org_specs = [
         org_upgrade_spec.org.dict(by_alias=True)
-        for org_upgrade_spec in upgrade_policies_per_org.values()
+        for org_upgrade_specs in upgrade_specs.values()
+        for org_upgrade_spec in org_upgrade_specs.values()
     ]
 
     results = get_upgrade_policies_data(
-        upgrade_policies, md_output, integration=ouso.QONTRACT_INTEGRATION
+        upgrade_policies, md_output, integration=aus_integration.name
     )
 
     if md_output: