qontract-reconcile 0.10.1rc478__py3-none-any.whl → 0.10.1rc480__py3-none-any.whl

{qontract_reconcile-0.10.1rc478.dist-info → qontract_reconcile-0.10.1rc480.dist-info}/METADATA

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

@@ -118,10 +118,10 @@ reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPtt
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=DQ9FrphzhKsKaXbXeA2v3Qsg1ABXXEtPhD-R-FwUsBA,21007
 reconcile/aus/aus_label_source.py,sha256=X6FD4NYcX27llMUSmmBcCh-pG7U5FnBd0zl-0zwCj2U,4118
-reconcile/aus/base.py,sha256=L7A_9N8fS98P2ltSuDI-ZFpjbLOlnBrYLPBAlZtep10,43625
+reconcile/aus/base.py,sha256=aad4dkVOTZfeLLNmdDranLugt8Z3whQuae86yyYcgBU,44417
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/metrics.py,sha256=fIew-rzi_kYuI5Gxn3-4bQVIr2oNibiKPyGnhB-xKU4,3538
-reconcile/aus/models.py,sha256=oBSVZ-3JTngxKg_bH1vAfREpz55t8K-Y3eC9TA4pOTw,6849
+reconcile/aus/models.py,sha256=muBmbovxYtSNLFrTLVRcJYZ4dx6JLh8n3Q1-DjWJOHM,7098
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=fshslI27hrqT40qrVsVOQaWxD-jkmzcVZryXzX7plhY,8960
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=7cK2SakCFkl5EdnqUEAYdUo4pUnnf-SsUR10uytAGyE,3058
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=OBgE5mnVdQQV4tMH0AE2V_PDt9Gy6d-LyuPceqjORts,2331
@@ -548,7 +548,7 @@ reconcile/utils/oc_map.py,sha256=nT69J5pdPeIDnIYjD9fwY6GkE3BMQCf-AF0rmHJuUNw,906
 reconcile/utils/ocm_base_client.py,sha256=UV-tQYrjg9kLYw2NE5nixrWlRz5bhyZsz8Q4WUhvBRA,6096
 reconcile/utils/openshift_resource.py,sha256=WYLetCNItODjoOVeYqbCaEx_Lv-ntsj6I97x-1o2yAk,25116
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
-reconcile/utils/output.py,sha256=htcMXMe0y2dNnwu8MW8x0JZ5YBaEJRy5w4tR8yLF0OU,1738
+reconcile/utils/output.py,sha256=4tObxIS_-EdJY_YCOOOmaYvHY40Q72IpYjWhjpJR1Ec,1856
 reconcile/utils/pagerduty_api.py,sha256=ckZZMn_ri7mUFsmMb8Lejuw5Lf_0-OWv8MbOzPc2zkQ,7567
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
@@ -650,8 +650,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 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.1rc478.dist-info/METADATA,sha256=hna64KDMpTcGUWltZpRGgY2cCZVu2V3HmAzSHyRgngE,2348
-qontract_reconcile-0.10.1rc478.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc478.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc478.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc478.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc480.dist-info/METADATA,sha256=sYbe-Q2S0gZ4HubbppDKF9dOJ541nozJHC35X5d-vzc,2348
+qontract_reconcile-0.10.1rc480.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc480.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc480.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc480.dist-info/RECORD,,

reconcile/aus/base.py

@@ -720,43 +720,42 @@ def version_conditions_met(
     return True
 
 
+def gates_for_minor_version(
+    gates: list[OCMVersionGate],
+    target_version_prefix: str,
+) -> list[OCMVersionGate]:
+    return [g for g in gates if g.version_raw_id_prefix == target_version_prefix]
+
+
 def gates_to_agree(
     gates: list[OCMVersionGate],
-    version_prefix: str,
-    cluster: OCMCluster,
+    cluster_id: str,
     ocm_api: OCMBaseClient,
 ) -> list[OCMVersionGate]:
     """Check via OCM if a version is agreed
 
     Args:
-        gates: list of OCMVersionGate objects
-        version_prefix (string): major.minor version prefix
-        cluster (string)
-        cluster_version (string): current version of the cluster
-        sts (bool): is the cluster a STS cluster
+        gates (OCMVersionGate): list of OCMVersionGate objects to check for agreements
+        cluster_id (str): the cluster that needs gate agreements
         ocm_api (OCMBaseClient): used to fetch infos from OCM
 
     Returns:
-        list[OCMVersionGate]: list of gates to agree
+        list[OCMVersionGate]: list of gates a cluster has not agreed on yet
     """
-    semver_cluster = parse_semver(f"{cluster.version.raw_id}")
-
     applicable_gates = [
         g
         for g in gates
-        if g.version_raw_id_prefix == version_prefix
         # todo: sts version gates need special handling - https://issues.redhat.com/browse/APPSRE-7949
         #       until this is solved, we can't do automated upgrades for STS clusters that cross a version gate
         #       once we have proper and secure handling get gate agreements for STS clusters, we can use this condition:
         #       `and (not g.sts_only or g.sts_only == cluster.is_sts())`
-        and not g.sts_only
-        and semver_cluster.match(f"<{g.version_raw_id_prefix}.0")
+        if not g.sts_only
     ]
 
     if applicable_gates:
         current_agreements = {
             agreement["version_gate"]["id"]
-            for agreement in get_version_agreement(ocm_api, cluster.id)
+            for agreement in get_version_agreement(ocm_api, cluster_id)
         }
         return [gate for gate in applicable_gates if gate.id not in current_agreements]
     return []
@@ -1002,6 +1001,22 @@ def calculate_diff(
                     )
                 )
             else:
+                target_version_prefix = get_version_prefix(version)
+                minor_version_gates = gates_for_minor_version(
+                    gates, target_version_prefix
+                )
+                # skipping upgrades when there are no version gates is a safety
+                # precaution to prevent cluster upgrades being scheduled.
+                # missing version gates are an indicator that the version has not yet gone
+                # through SREP gap analysis and is not yet ready for upgrades.
+                #
+                # this might change in the future - revisite for 4.16
+                if not minor_version_gates:
+                    logging.debug(
+                        f"[{spec.org.org_id}/{spec.cluster.name}] no gates found for {target_version_prefix}. "
+                        "Skip creation of an upgrade policy."
+                    )
+                    continue
                 diffs.append(
                     UpgradePolicyHandler(
                         action="create",
@@ -1009,9 +1024,8 @@ def calculate_diff(
                         gates_to_agree=[
                             GateAgreement(gate=g)
                             for g in gates_to_agree(
-                                gates,
-                                get_version_prefix(version),
-                                spec.cluster,
+                                minor_version_gates,
+                                spec.cluster.id,
                                 ocm_api,
                             )
                         ],

reconcile/aus/models.py

@@ -133,9 +133,14 @@ class OrganizationUpgradeSpec(BaseModel):
         # add clusters to their sectors
         if spec.upgrade_policy.conditions.sector:
             if spec.upgrade_policy.conditions.sector not in self._sectors:
-                raise ValueError(
+                self.add_organization_error(
                     f"sector {spec.upgrade_policy.conditions.sector} not found in organization"
                 )
+                self.add_cluster_error(
+                    spec.cluster_uuid,
+                    f"cluster {spec.cluster_uuid} references unknown sector {spec.upgrade_policy.conditions.sector}",
+                )
+                return
             self._sectors[spec.upgrade_policy.conditions.sector].add_spec(spec)
         self._specs.append(spec)
         self._specs.sort(key=upgrade_spec_sort_key)

reconcile/utils/output.py

@@ -53,6 +53,8 @@ def format_table(content, columns, table_format="simple") -> str:
                     cell = "<br />".join(cell)
                 else:
                     cell = "\n".join(cell)
+            if table_format == "github" and isinstance(cell, str):
+                cell = cell.replace("|", "&#124;")
             row_data.append(cell)
         table_data.append(row_data)
     return tabulate(table_data, headers=headers, tablefmt=table_format)