qontract-reconcile 0.10.1rc853__py3-none-any.whl → 0.10.1rc854__py3-none-any.whl

{qontract_reconcile-0.10.1rc853.dist-info → qontract_reconcile-0.10.1rc854.dist-info}/METADATA

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

@@ -60,7 +60,7 @@ reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3
 reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
 reconcile/ocm_machine_pools.py,sha256=oY4oLPm5Y_ajBV8KFg2LuBQvsZl-CxTjSxEyxg4b2OI,16634
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
-reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=49Ss6sp9_n5F9914gXb-uEap4Vm2t-KPTJRFFViJMIo,4184
+reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=sQSicCyU-TPtIBYsSn97qzYiQLFaMmOMSFr1OP6tOck,4308
 reconcile/openshift_base.py,sha256=mE_NuKgEFsZDeA3kUo4iMsvIF1wN5yemUHeuE0M9fbY,49735
 reconcile/openshift_cluster_bots.py,sha256=eRPYZqWMKFNxLlSN0QG97V5t1iIESQ0BbGaiaQP5VB0,10940
 reconcile/openshift_clusterrolebindings.py,sha256=QfSy1Ik8eEY5XObc1Q4xyhqyErZenJmbPv_u9wcDNNo,5864
@@ -204,8 +204,8 @@ reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoB
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
 reconcile/gql_definitions/acs/acs_rbac.py,sha256=cZsIlCWliPQdQHgmBsIMx54fJNOtkdRXLzmOKZmJNHk,3009
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=JyOmY7EZutEqMM11W9RBbo-lmyhPNQuVMBmUFWUFiRw,4317
-reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=CAKXTY23_ow7_lz4K3kS1QQMqwjpMLep_L_mOzHi6Ug,3315
+reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=RpOrRYJnC6qgf5AvfB80Knp2Ww9R0viuxYVg_LetglY,4366
+reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=zU-WJ9CASV1Ok-1jUro6K426v3ug5YNR1XoXmV7SwQ8,3364
 reconcile/gql_definitions/app_interface_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/app_interface_metrics_exporter/onboarding_status.py,sha256=uVEEqU6YYmKsNTo6EWlFnoVmqha2rvBDx-wiD64VmG0,1679
 reconcile/gql_definitions/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -277,7 +277,7 @@ reconcile/gql_definitions/external_resources/external_resources_modules.py,sha25
 reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=UyOAUY1rROenjTz6y-uSEFjrEwhh-lPsIQPbi6EQLFg,40915
 reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=989_pG9NWKB5BPvdwqjqZUYp_2qf-xYmJ9c9kq8Kmfw,2886
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/fragments/aus_organization.py,sha256=ARI87YAbC0VjFri9eVGYrRPBc4s0kWsa25RR8FFoq7E,4433
+reconcile/gql_definitions/fragments/aus_organization.py,sha256=uBKbTuBa3CZmTXR5HOcGhRcu2U9kM93KbYmoWTxcpB0,4767
 reconcile/gql_definitions/fragments/aws_account_common.py,sha256=3-7ZAP6GSff7Z2Syz2VQCLY4IySqBOSVmceaRiVNQpw,2385
 reconcile/gql_definitions/fragments/aws_account_managed.py,sha256=zXbux0Bb7QZ37fU4LLMKB4m0rT3Y8bD10C1TuOsH_ZQ,1470
 reconcile/gql_definitions/fragments/aws_account_sso.py,sha256=ITR3PLz4Iq1SiWAoYGWPDuHJnAmTyZ0QQqs2Zsi8pxA,979
@@ -754,7 +754,7 @@ reconcile/utils/mr/glitchtip_access_reporter.py,sha256=dTv6FRpLnR2Itxw0oZ-ShKp8h
 reconcile/utils/mr/labels.py,sha256=9QRTRjZAtq45zELd9SwavaraczMjwjn5no3RK1YxFTg,825
 reconcile/utils/mr/notificator.py,sha256=2Xyg5Xh3xFQITdTmZ8Nry5qe0uC_w_On4uMPdlN5Bl4,2998
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
-reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9pyNFZ1cNZFmDGBUah9vjpP0y9f9w,2810
+reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=m2MGZP7OC9cQASZJ5VKfQjkW25kRQNW3ZAfApX7kKkk,2996
 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=IHlqOO12TAdYwwU6Oedz3ussF1kELj9EI5GxPP6LKi8,7376
@@ -811,7 +811,7 @@ tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=w8hl4jIEWk5wKbEFN6fVEOwUJGmdlvOqYodW3XSN7mU,4978
-tools/cli_commands/systems_and_tools.py,sha256=SRMV-VZn2BQ9JeUY_w5O8M_f9eMVxu7LidISUi1cfJQ,15073
+tools/cli_commands/systems_and_tools.py,sha256=CSBxM-rzUn_-RuLJpSqSSd0TsKzrG4OPSRmcwVdA40s,16856
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=bdvbT3bDymBOMx4Ve4kt154MeGiGusTSpOpMMFrQ4SM,5191
 tools/cli_commands/cost_report/cost_management_api.py,sha256=tFzjaZ3RSVJeAUsfSWXHiQlMVbV8dFcXibK158ODQcA,2549
@@ -834,8 +834,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.1rc853.dist-info/METADATA,sha256=W5TRijLMJq6p3otR0e2cFukDGKaXc92OO95yZAQM1Sk,2273
-qontract_reconcile-0.10.1rc853.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc853.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc853.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc853.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc854.dist-info/METADATA,sha256=FNdlNh3I5vJN_daQGIkW10vxGmMPVgD7hTkV_V7JCXI,2273
+qontract_reconcile-0.10.1rc854.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc854.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc854.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc854.dist-info/RECORD,,

reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py

@@ -24,6 +24,7 @@ from reconcile.gql_definitions.fragments.upgrade_policy import ClusterUpgradePol
 DEFINITION = """
 fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   name
+  labels
   environment {
     ... OCMEnvironment
   }
@@ -75,6 +76,10 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   upgradePolicyAllowedWorkloads
   upgradePolicyClusters {
     name
+    serverUrl
+    spec {
+      id
+    }
     upgradePolicy {
       ... ClusterUpgradePolicyV1
     }

reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py

@@ -23,6 +23,7 @@ from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganizat
 DEFINITION = """
 fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   name
+  labels
   environment {
     ... OCMEnvironment
   }
@@ -74,6 +75,10 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   upgradePolicyAllowedWorkloads
   upgradePolicyClusters {
     name
+    serverUrl
+    spec {
+      id
+    }
     upgradePolicy {
       ... ClusterUpgradePolicyV1
     }

reconcile/gql_definitions/fragments/aus_organization.py

@@ -70,8 +70,14 @@ class OpenShiftClusterManagerSectorV1(ConfiguredBaseModel):
     dependencies: Optional[list[OpenShiftClusterManagerSectorDependenciesV1]] = Field(..., alias="dependencies")
 
 
+class OpenShiftClusterManagerUpgradePolicyClusterSpecV1(ConfiguredBaseModel):
+    q_id: str = Field(..., alias="id")
+
+
 class OpenShiftClusterManagerUpgradePolicyClusterV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    server_url: Optional[str] = Field(..., alias="serverUrl")
+    spec: Optional[OpenShiftClusterManagerUpgradePolicyClusterSpecV1] = Field(..., alias="spec")
     upgrade_policy: ClusterUpgradePolicyV1 = Field(..., alias="upgradePolicy")
 
 
@@ -82,6 +88,7 @@ class AusClusterHealthCheckV1(ConfiguredBaseModel):
 
 class AUSOCMOrganization(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    labels: Optional[Json] = Field(..., alias="labels")
     environment: OCMEnvironment = Field(..., alias="environment")
     org_id: str = Field(..., alias="orgId")
     access_token_client_id: Optional[str] = Field(..., alias="accessTokenClientId")

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -90,6 +90,8 @@ def run(dry_run, gitlab_project_id):
                         item = {
                             "action": "add",
                             "cluster": ocm_cluster_name,
+                            "url": ocm_cluster_spec.server_url,
+                            "id": ocm_cluster_spec.spec.id,
                             "policy": policy,
                         }
                         updates.append(item)

reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py

@@ -37,6 +37,8 @@ class CreateOCMUpgradeSchedulerOrgUpdates(MergeRequestBase):
         for update in self.updates_info["updates"]:
             action = update["action"]
             cluster_name = update["cluster"]
+            cluster_id = update["id"]
+            cluster_server_url = update["url"]
             upgrade_policy = update.get("policy")
 
             if action == "add":
@@ -47,6 +49,8 @@ class CreateOCMUpgradeSchedulerOrgUpdates(MergeRequestBase):
                     continue
                 item = {
                     "name": cluster_name,
+                    "serverUrl": cluster_server_url,
+                    "spec": {"id": cluster_id},
                     "upgradePolicy": upgrade_policy,
                 }
                 upgrade_policy_clusters.append(item)

tools/cli_commands/systems_and_tools.py

@@ -3,11 +3,16 @@
 
 from typing import (
     Any,
+    Optional,
     Self,
 )
 
 from pydantic import BaseModel
 
+from reconcile.aus.base import get_orgs_for_environment
+from reconcile.gql_definitions.advanced_upgrade_service.aus_organization import (
+    DEFINITION as AUS_ORGANIZATION_DEFINITION,
+)
 from reconcile.gql_definitions.common.app_code_component_repos import (
     DEFINITION as CODE_COMPONENTS_DEFINITION,
 )
@@ -47,6 +52,9 @@ from reconcile.gql_definitions.dynatrace_token_provider.dynatrace_bootstrap_toke
 from reconcile.gql_definitions.dynatrace_token_provider.dynatrace_bootstrap_tokens import (
     DynatraceEnvironmentV1,
 )
+from reconcile.gql_definitions.fragments.aus_organization import (
+    OpenShiftClusterManagerUpgradePolicyClusterV1,
+)
 from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.gql_definitions.gitlab_members.gitlab_instances import (
     DEFINITION as GITLAB_INSTANCES_DEFINITION,
@@ -136,7 +144,9 @@ class SystemTool(BaseModel):
     enumeration: str
 
     @classmethod
-    def init_from_model(cls, model: Any, enumeration: Any) -> Self:
+    def init_from_model(
+        cls, model: Any, enumeration: Any, parent: Optional[str] = None
+    ) -> Self:
         match model:
             case GitlabInstanceV1():
                 return cls.init_from_gitlab(model, enumeration)
@@ -154,6 +164,10 @@ class SystemTool(BaseModel):
                 return cls.init_from_jira_server(model, enumeration)
             case OCMEnvironment():
                 return cls.init_from_ocm_environment(model, enumeration)
+            case OpenShiftClusterManagerUpgradePolicyClusterV1():
+                return cls.init_from_ocm_org_upgrade_policy_cluster(
+                    model, enumeration, parent
+                )
             case PagerDutyInstanceV1():
                 return cls.init_from_pagerduty_instance(model, enumeration)
             case QuayInstanceV1():
@@ -265,6 +279,24 @@ class SystemTool(BaseModel):
             enumeration=enumeration,
         )
 
+    @classmethod
+    def init_from_ocm_org_upgrade_policy_cluster(
+        cls,
+        c: OpenShiftClusterManagerUpgradePolicyClusterV1,
+        enumeration: Any,
+        parent: Optional[str] = None,
+    ) -> Self:
+        return cls(
+            system_type="openshift",
+            system_id=c.spec.q_id if c.spec else "",
+            name=c.name,
+            url=c.server_url,
+            description=f"cluster {c.name} in organization {parent}"
+            if parent
+            else c.name,
+            enumeration=enumeration,
+        )
+
     @classmethod
     def init_from_pagerduty_instance(
         cls, p: PagerDutyInstanceV1, enumeration: Any
@@ -362,12 +394,18 @@ class SystemToolInventory:
     def __init__(self) -> None:
         self.systems_and_tools: list[SystemTool] = []
 
-    def append(self, model: Any, enumeration: Any) -> None:
-        self.systems_and_tools.append(SystemTool.init_from_model(model, enumeration))
+    def append(
+        self, model: Any, enumeration: Any, parent: Optional[str] = None
+    ) -> None:
+        self.systems_and_tools.append(
+            SystemTool.init_from_model(model, enumeration, parent=parent)
+        )
 
-    def update(self, models: list[Any], enumeration: Any) -> None:
+    def update(
+        self, models: list[Any], enumeration: Any, parent: Optional[str] = None
+    ) -> None:
         for m in models:
-            self.append(m, enumeration)
+            self.append(m, enumeration, parent=parent)
 
     @property
     def data(self) -> list[dict[str, Any]]:
@@ -408,7 +446,20 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
     inventory.update(get_dynatrace_environments(), DYNATRACE_ENVIRONMENTS_DEFINITION)
     inventory.update(get_glitchtip_instances(), GLITCHTIP_INSTANCES_DEFINITION)
     inventory.update(get_jira_servers(), JIRA_SERVERS_DEFINITION)
-    inventory.update(get_ocm_environments(), OCM_ENVIRONMENTS_DEFINITION)
+    ocm_environments = get_ocm_environments()
+    inventory.update(ocm_environments, OCM_ENVIRONMENTS_DEFINITION)
+    for ocm_env in ocm_environments:
+        ocm_env_orgs = get_orgs_for_environment(
+            "", ocm_env.name, query_func=gql_api.query
+        )
+        for ocm_org in ocm_env_orgs:
+            if ocm_org.labels and "systems_and_tools_report" in ocm_org.labels:
+                inventory.update(
+                    ocm_org.upgrade_policy_clusters or [],
+                    AUS_ORGANIZATION_DEFINITION,
+                    parent=f"{ocm_org.name} ({ocm_env.name})",
+                )
+
     inventory.update(
         get_pagerduty_instances(gql_api.query), PAGERDUTY_INSTANCES_DEFINITION
     )