qontract-reconcile 0.10.1rc484__py3-none-any.whl → 0.10.1rc486__py3-none-any.whl

{qontract_reconcile-0.10.1rc484.dist-info → qontract_reconcile-0.10.1rc486.dist-info}/METADATA

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

@@ -68,7 +68,7 @@ reconcile/openshift_namespaces.py,sha256=DboMc6t0vXD54lL9ZP9P9fQnCRo2g_0z5FWubtW
 reconcile/openshift_network_policies.py,sha256=_qqv7yj17OM1J8KJPsFmzFZ85gzESJeBocC672z4_WU,4231
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016ng8,1400
-reconcile/openshift_resources_base.py,sha256=p0YEHJrRgpFQOVvs5vAGDhLno_OJMHWMxnICEEQHFxk,45669
+reconcile/openshift_resources_base.py,sha256=ZhNVhotSbp2Ue3cMEqso-Cmug6vDV67lwX7pEvUpmbw,45787
 reconcile/openshift_rolebindings.py,sha256=0sEKajdqVuBSzlagyPbLxtNXQdI2vyabmbIRifs0des,6629
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=MySDWBQN2N3rv_B8ifWzRY5t2Afq3DEVkFECHMpW_Sk,11908
@@ -118,7 +118,7 @@ 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=wbFL8hjVaIhdQWfIxxVYfUxbp375aTZfURD65c3o70o,44558
+reconcile/aus/base.py,sha256=Qdktz7W7J9TWVCYJZHwyKoIf4sVI7W9o_WwzsOBxLfQ,44912
 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=muBmbovxYtSNLFrTLVRcJYZ4dx6JLh8n3Q1-DjWJOHM,7098
@@ -407,7 +407,7 @@ reconcile/test/test_openshift_saas_deploy.py,sha256=YLJGkc--u5aP0UkQ-b9ZGEFGS2gw
 reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn6qdnKge5Sa_s732c-8uZqCnuT1gGI,12871
 reconcile/test/test_openshift_tekton_resources.py,sha256=RtRWsdm51S13OSkENC9nY_rOH0QELSCaO5tjF0XqIDI,11222
 reconcile/test/test_openshift_upgrade_watcher.py,sha256=na5Q5l88c0ZHMh82gvNpYheoMOAzEZRG0ZvzzDhafYE,7100
-reconcile/test/test_prometheus_rules_tester.py,sha256=nj17JNpjArMKwLc1B7Y6Ca-tkO24Y-yXhQXB78Mco0o,5968
+reconcile/test/test_prometheus_rules_tester.py,sha256=Qc9J4k0lSVie361lGr_cOy0EaBTD5LDqGZf7CYVFKr8,5677
 reconcile/test/test_quay_membership.py,sha256=e29Giz5S9ckFgjpTO8PBo8qVPocIQmy4WqsRhgTFd9A,2643
 reconcile/test/test_quay_mirror.py,sha256=-oPPFjx2OmzTwZ5oxblrvx2y4zzgUj8SYHdnjcOIqCE,5693
 reconcile/test/test_quay_mirror_org.py,sha256=eudGIGCUlYul2UHx4Ku6zFvwLeJtRyOIx06XuwFox2U,2630
@@ -599,7 +599,7 @@ reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9py
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=5Pcf5cyftDWT5XRi1EzvNklOVxGplJi-v12HN3TDarc,57
 reconcile/utils/ocm/addons.py,sha256=8wVrt16i69KkXq1fQByVheSQRhrRELbuOHb7Tz9bKT0,1675
-reconcile/utils/ocm/base.py,sha256=iFGYzlXrGD-kKDat2IFkHFGO2m3nq7I0olQ5kbKvLww,11698
+reconcile/utils/ocm/base.py,sha256=7jm37vMoIIaSnOZe02_6VZFIh0IDa-VVIqfR1FoddZQ,11872
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Q6g5kGSNfxZUZ56LPFAYjOz8xJ2c6QG76V78GvyLxB0,7448
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -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.1rc484.dist-info/METADATA,sha256=RWoM1MOR8OKWAK3-2tVFeN4Dh8Xzf59EvSTkBtc0Hrw,2348
-qontract_reconcile-0.10.1rc484.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc484.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc484.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc484.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc486.dist-info/METADATA,sha256=CTLduvx8nGxywJ0LUGJNXYjs7iNroxFIrxKuEOFMU-g,2348
+qontract_reconcile-0.10.1rc486.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc486.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc486.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc486.dist-info/RECORD,,

reconcile/aus/base.py

@@ -729,7 +729,7 @@ def gates_for_minor_version(
 
 def gates_to_agree(
     gates: list[OCMVersionGate],
-    cluster_id: str,
+    cluster: OCMCluster,
     ocm_api: OCMBaseClient,
 ) -> list[OCMVersionGate]:
     """Check via OCM if a version is agreed
@@ -750,12 +750,18 @@ def gates_to_agree(
         #       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())`
         if not g.sts_only
+        # consider only gates after the clusters current minor version
+        # OCM onls supports creating gate agreements for later minor versions than the
+        # current cluster version
+        and semver.match(
+            f"{cluster.minor_version()}.0", f"<{g.version_raw_id_prefix}.0"
+        )
     ]
 
     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 []
@@ -1003,7 +1009,8 @@ def calculate_diff(
             else:
                 target_version_prefix = get_version_prefix(version)
                 minor_version_gates = gates_for_minor_version(
-                    gates, target_version_prefix
+                    gates=gates,
+                    target_version_prefix=target_version_prefix,
                 )
                 # skipping upgrades when there are no version gates is a safety
                 # precaution to prevent cluster upgrades being scheduled.
@@ -1025,7 +1032,7 @@ def calculate_diff(
                             GateAgreement(gate=g)
                             for g in gates_to_agree(
                                 minor_version_gates,
-                                spec.cluster.id,
+                                spec.cluster,
                                 ocm_api,
                             )
                         ],

reconcile/openshift_resources_base.py

@@ -6,32 +6,55 @@ import logging
 import re
 import sys
 from collections import defaultdict
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import (
+    Iterable,
+    Mapping,
+    Sequence,
+)
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cache
 from textwrap import indent
 from threading import Lock
-from typing import Any, Optional, Protocol, Tuple
+from typing import (
+    Any,
+    Optional,
+    Protocol,
+    Tuple,
+)
 from urllib import parse
 
 import anymarkup
 import jinja2
 import jinja2.sandbox
 from deepdiff import DeepHash
-from sretoolbox.utils import retry, threaded
+from sretoolbox.utils import (
+    retry,
+    threaded,
+)
 
 import reconcile.openshift_base as ob
 from reconcile import queries
 from reconcile.change_owners.diff import IDENTIFIER_FIELD_NAME
 from reconcile.checkpoint import url_makes_sense
 from reconcile.github_users import init_github
-from reconcile.typed_queries.app_interface_repo_url import get_app_interface_repo_url
-from reconcile.utils import amtool, gql, openssl
+from reconcile.utils import (
+    amtool,
+    gql,
+    openssl,
+)
 from reconcile.utils.defer import defer
 from reconcile.utils.exceptions import FetchResourceError
-from reconcile.utils.jinja2_ext import B64EncodeExtension, RaiseErrorExtension
-from reconcile.utils.oc import OC_Map, OCClient, OCLogMsg, StatusCodeError
+from reconcile.utils.jinja2_ext import (
+    B64EncodeExtension,
+    RaiseErrorExtension,
+)
+from reconcile.utils.oc import (
+    OC_Map,
+    OCClient,
+    OCLogMsg,
+    StatusCodeError,
+)
 from reconcile.utils.openshift_resource import (
     ConstructResourceError,
     ResourceInventory,
@@ -44,7 +67,10 @@ from reconcile.utils.runtime.integration import DesiredStateShardConfig
 from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.sharding import is_in_shard
-from reconcile.utils.vault import SecretVersionIsNone, SecretVersionNotFound
+from reconcile.utils.vault import (
+    SecretVersionIsNone,
+    SecretVersionNotFound,
+)
 
 # +-----------------------+-------------------------+-------------+
 # |   Current / Desired   |         Present         | Not Present |
@@ -461,8 +487,6 @@ def fetch_provider_resource(
 ) -> OR:
     path = resource["path"]
     content = resource["content"]
-    gqlapi = gql.get_api()
-    app_int_base_url = get_app_interface_repo_url(query_func=gqlapi.query)
     if tfunc:
         content = tfunc(body=content, vars=tvars, settings=settings)
 
@@ -511,6 +535,9 @@ def fetch_provider_resource(
 
     if add_path_to_prom_rules:
         if body["kind"] == "PrometheusRule":
+            app_int_base_url = "https://gitlab.cee.redhat.com/service/app-interface"
+            if settings and "repoUrl" in settings:
+                app_int_base_url = settings["repoUrl"]
             try:
                 groups = body["spec"]["groups"]
                 for group in groups:

reconcile/test/test_prometheus_rules_tester.py

@@ -1,17 +1,20 @@
 from typing import Any
-from unittest.mock import create_autospec, patch
+from unittest.mock import (
+    create_autospec,
+    patch,
+)
 
 import pytest
 
-from reconcile.gql_definitions.common.app_interface_repo_settings import (
-    DEFINITION as SETTINGS_QUERY,
-)
 from reconcile.gql_definitions.common.app_interface_vault_settings import (
     AppInterfaceSettingsV1,
 )
 from reconcile.openshift_resources_base import NAMESPACES_QUERY
 from reconcile.prometheus_rules_tester.integration import Test as PTest
-from reconcile.prometheus_rules_tester.integration import check_rules_and_tests, run
+from reconcile.prometheus_rules_tester.integration import (
+    check_rules_and_tests,
+    run,
+)
 from reconcile.status import ExitCodes
 from reconcile.utils import gql
 
@@ -39,12 +42,6 @@ class TestPrometheusRulesTester:
         """Mock for GqlApi.query using test_data set in setup_method."""
         if query == NAMESPACES_QUERY:
             return {"namespaces": self.ns_data}
-        if query == SETTINGS_QUERY:
-            return {
-                "settings": [
-                    {"repoUrl": "https://gitlab.cee.redhat.com/service/app-interface"}
-                ]
-            }
 
         raise TstUnsupportedGqlQueryError("Unsupported query")
 

reconcile/utils/ocm/base.py

@@ -8,6 +8,7 @@ from typing import (
     TypeVar,
 )
 
+import semver
 from pydantic import (
     BaseModel,
     Field,
@@ -188,6 +189,10 @@ class OCMCluster(BaseModel):
 
     external_configuration: Optional[OCMExternalConfiguration]
 
+    def minor_version(self) -> str:
+        version_info = semver.parse(self.version.raw_id)
+        return f"{version_info['major']}.{version_info['minor']}"
+
     def available_upgrades(self) -> list[str]:
         return self.version.available_upgrades