qontract-reconcile 0.10.1rc452__py3-none-any.whl → 0.10.1rc454__py3-none-any.whl

{qontract_reconcile-0.10.1rc452.dist-info → qontract_reconcile-0.10.1rc454.dist-info}/METADATA

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

@@ -52,7 +52,7 @@ reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLK
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=L1ktYynIR7pmHiYtdCTdLGJRKX72B54KUAuPLOccXzo,3995
 reconcile/ocm_aws_infrastructure_access.py,sha256=iq6Rj5SgF7yIMvBhukTuy-KcrFsvLs1ATG6-dyiArqY,6960
-reconcile/ocm_clusters.py,sha256=ibK0o0rXhAnq4TF522aPkVlH7i0bdtgD8-IKmZ8PHjs,13451
+reconcile/ocm_clusters.py,sha256=Bw6F5GBQmdwWacXgZ2OzN1v7Mu4TRQ4k7ToZ02hnvoQ,13900
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=IlSpoUlUhYOahqWee6azJiN-N5EZNxNAWh-lrPXTfEc,3946
 reconcile/ocm_groups.py,sha256=_kiMUndKc6as6cbbvXxVnq8V_Lj7X5lxMJVCuRWuUFE,2888
@@ -90,7 +90,7 @@ reconcile/quay_mirror.py,sha256=Ru9_KKODCqUea85QDxdDpiONqr6T2CCw_btxRiKuQ1U,1411
 reconcile/quay_mirror_org.py,sha256=8PV_LDSPqvFyOAguxe4bk4yrszNwAk2jd9cwKeluluE,10319
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=CH_GSoyfItDdx1bDyXgNfiYvCloGSwaZoipglgHq9mc,49164
+reconcile/queries.py,sha256=fQ7PII4j8zzXwGeTQzCKRG05-Wk9H7oQyhtSeISEyU0,49190
 reconcile/query_validator.py,sha256=BAjGrU8_VhzTOv5k0-uz0hY9ziZyconv8VAhgre1Auc,1497
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -311,7 +311,7 @@ reconcile/jenkins/types.py,sha256=0UlyJxv3KY1WXHkfI_ghUI6FAwRJTL4EwvLg-62tNcg,30
 reconcile/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ldap_groups/integration.py,sha256=II5f1yt6TypG4upmzHO1jcVrn8DcYsi9cj2l4fHolmc,7734
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ocm/types.py,sha256=e9t6wY9Ckj1L1Jcqz6k7kspaGGLBE8yKcZTmzmoLoCU,2440
+reconcile/ocm/types.py,sha256=Q9vPQI3LpLajGtPqks7i36AV6CjRho96mmsTkdJrEWM,2477
 reconcile/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm_labels/integration.py,sha256=SqIgCYhlHEeoH2YXJ8kWIxCo9S3fzzAlZGxt9KCnJ1s,14792
 reconcile/ocm_labels/label_sources.py,sha256=z5Rg5uMTfRkTi3QbEQK1P82LLciWrSnp65XBEpZf2-o,1877
@@ -390,7 +390,7 @@ reconcile/test/test_jump_host.py,sha256=ZrsdafquKYXFyGSZFH86aVtF-BsLnYdW1FGH3l5Q
 reconcile/test/test_ldap_users.py,sha256=8jjzVgoiRRylGad6-TvkugoFGXt3eko--zVVKjmZDn4,3812
 reconcile/test/test_make.py,sha256=zTdjgq-3idFlec_0qJenk9wWw0QMLvSpJfPsptXmync,677
 reconcile/test/test_ocm_additional_routers.py,sha256=dtbpUnD5un6Q3VoLbuFRb_njmt5SSCnBzvSSBcO_Xxs,4248
-reconcile/test/test_ocm_clusters.py,sha256=MLH6r5G-T3e53tYDoyJYfC6X1oEZGmakk1SXR1w3jJw,22490
+reconcile/test/test_ocm_clusters.py,sha256=NOxhJnlgOlRZF0-sfXCiRP0aiNiBiMl35MTCCh_Ff5s,23130
 reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=jFRVfc5jby1kI2x_gT6wcqPPgkav1et9wZH6JqQbNSY,3278
 reconcile/test/test_ocm_machine_pools.py,sha256=3qo6t2Jfr1Wee0NUacyLTDmatp0o7CUNpkVOpHiOiGk,29737
 reconcile/test/test_ocm_update_recommended_version.py,sha256=iA4BVirTGVXlwcOyeR52IuNO81X_8NR6ZNd7ZFE7igs,4328
@@ -427,7 +427,7 @@ reconcile/test/test_terraform_repo.py,sha256=e9mxguROC8xG-zXQojwW-agbfsuBXjYc1wy
 reconcile/test/test_terraform_resources.py,sha256=1ny_QSFuRjV9jxZY8EeT4NVJ5dMv7cLrEEIx_cBpjgk,9075
 reconcile/test/test_terraform_tgw_attachments.py,sha256=DLZ4OhqJanUvcLMXTzf3NLpZBPDr0qUre-Xx2pP-l2E,35287
 reconcile/test/test_terraform_users.py,sha256=Xn4y6EcxnNQb6XcPoOhz_Ikxmh9Nrsu88OM1scN9hzY,5434
-reconcile/test/test_terraform_vpc_peerings.py,sha256=4J6sAoYujhwyHfuvzFbXv122X_9LMODokazjTnI2AZo,19719
+reconcile/test/test_terraform_vpc_peerings.py,sha256=YBab2Y9oJhnk2DO0hMueMYUew77md5OwyNqNYWrewB0,19639
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=vAWmvFqlCe-usEYueYjFFNq2bsDdxILmLwIdGvA2VE4,37002
 reconcile/test/test_three_way_diff_strategy.py,sha256=2fjEqE2w4pIzKq18PRcADTSe01aGwsZfMGloU8xfNaE,3346
 reconcile/test/test_unleash.py,sha256=c1s_FRAZrAzzd3FbZrzHYjJzHELhoxPHBZnEzqsfMQg,6416
@@ -600,7 +600,7 @@ reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZp
 reconcile/utils/ocm/clusters.py,sha256=Q6g5kGSNfxZUZ56LPFAYjOz8xJ2c6QG76V78GvyLxB0,7448
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
 reconcile/utils/ocm/labels.py,sha256=pRzTE506hKAgVbBNO51IBlGOuCbJmTYDMsL0pWBEwp8,5945
-reconcile/utils/ocm/ocm.py,sha256=0Alm-TRJz6JMKWuAwcHr9kG6pVsiLQ9bqTp29IUtJiQ,57662
+reconcile/utils/ocm/ocm.py,sha256=drUa6n57YMc4JIrnJOOr3dp4YBFUw0wjVJ8u8mT2Iks,57904
 reconcile/utils/ocm/search_filters.py,sha256=zExZpYBh7_tucG-xKoPHUxz1b_6l9qwbEMpMihQg7nA,15043
 reconcile/utils/ocm/service_log.py,sha256=XmGOP6hwhKwMEMeD0GhErTGzdgk1IHaKs-QatL1mAdY,2052
 reconcile/utils/ocm/sre_capability_labels.py,sha256=-TUmTzvK5yu7qY8SUMGj6-684wa8ZVYbjrJ6X3M7z-o,1576
@@ -646,8 +646,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.1rc452.dist-info/METADATA,sha256=_cA6zCEHZIudL-Y7d_pJSAyLERrwlCWXIPQj9Z8JD-I,2348
-qontract_reconcile-0.10.1rc452.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc452.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc452.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc452.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc454.dist-info/METADATA,sha256=ItStqIoJC2xrXjkt-YcNnXzj0-_eRxT4Yy1Hml6t_HY,2348
+qontract_reconcile-0.10.1rc454.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc454.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc454.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc454.dist-info/RECORD,,

reconcile/ocm/types.py

@@ -84,6 +84,7 @@ class ROSAClusterSpec(OCMClusterSpec):
     account: ROSAClusterAWSAccount
     subnet_ids: Optional[list[str]]
     availability_zones: Optional[list[str]]
+    oidc_endpoint_url: Optional[str]
 
     class Config:
         extra = Extra.forbid

reconcile/ocm_clusters.py

@@ -15,6 +15,7 @@ from reconcile import (
 from reconcile.ocm.types import (
     OCMSpec,
     ROSAClusterAWSAccount,
+    ROSAClusterSpec,
     ROSAOcmAwsAttrs,
     ROSAOcmAwsStsAttrs,
 )
@@ -174,6 +175,18 @@ def get_app_interface_spec_updates(
             ocmmod.SPEC_ATTR_PROVISION_SHARD_ID
         ] = current_spec.spec.provision_shard_id
 
+    if isinstance(current_spec.spec, ROSAClusterSpec) and isinstance(
+        desired_spec.spec, ROSAClusterSpec
+    ):
+        if (
+            current_spec.spec.oidc_endpoint_url
+            and desired_spec.spec.oidc_endpoint_url
+            != current_spec.spec.oidc_endpoint_url
+        ):
+            ocm_spec_updates[
+                ocmmod.SPEC_ATTR_OIDC_ENDPONT_URL
+            ] = current_spec.spec.oidc_endpoint_url
+
     if current_spec.server_url and desired_spec.server_url != current_spec.server_url:
         root_updates[ocmmod.SPEC_ATTR_SERVER_URL] = current_spec.server_url
 

reconcile/queries.py

@@ -747,6 +747,7 @@ CLUSTERS_QUERY = """
       ... on ClusterSpecROSA_v1 {
         subnet_ids
         availability_zones
+        oidc_endpoint_url
         account {
           name
           uid

reconcile/test/test_ocm_clusters.py

@@ -602,6 +602,25 @@ def test_ocm_rosa_update_cluster(
     assert cluster_updates_mr_mock.call_count == 0
 
 
+def test_ocm_rosa_update_cluster_dont_update_ocm_on_oidc_drift(
+    get_json_mock,
+    queries_mock,
+    ocm_mock,
+    cluster_updates_mr_mock,
+    ocm_rosa_cluster_raw_spec,
+    ocm_rosa_cluster_ai_spec,
+):
+    ocm_rosa_cluster_ai_spec["spec"]["oidc_endpoint_url"] = "some-other-oidc-url"
+    get_json_mock.return_value = {"items": [ocm_rosa_cluster_raw_spec]}
+    queries_mock[1].return_value = [ocm_rosa_cluster_ai_spec]
+    with pytest.raises(SystemExit):
+        occ.run(dry_run=False)
+    _post, _patch = ocm_mock
+    assert _post.call_count == 0
+    assert _patch.call_count == 0
+    assert cluster_updates_mr_mock.call_count == 1
+
+
 def test_ocm_rosa_update_cluster_with_machine_pools_change(
     get_json_mock,
     queries_mock,

reconcile/test/test_terraform_vpc_peerings.py

@@ -189,7 +189,7 @@ def test_c2c_vpc_peering_assume_role_accepter_connection_acc_overwrite(mocker):
         requester_cluster,
         accepter_connection,
         accepter_cluster,
-        ocm,  # type: ignore
+        ocm,
     )
 
     expected_req_aws = {
@@ -240,7 +240,7 @@ def test_c2c_vpc_peering_assume_role_acc_overwrite_fail(mocker):
             requester_cluster,
             accepter_connection,
             accepter_cluster,
-            ocm,  # type: ignore
+            ocm,
         )
     assert str(ex.value).startswith("[account_not_allowed]")
 
@@ -269,7 +269,7 @@ def test_c2c_vpc_peering_assume_role_accepter_cluster_account(mocker):
         requester_cluster,
         accepter_connection,
         accepter_cluster,
-        ocm,  # type: ignore
+        ocm,
     )
 
     expected_req_aws = {
@@ -313,7 +313,7 @@ def test_c2c_vpc_peering_missing_ocm_assume_role(mocker):
             requester_cluster,
             accepter_connection,
             accepter_cluster,
-            ocm,  # type: ignore
+            ocm,
         )
     assert str(ex.value).startswith("[assume_role_not_found]")
 
@@ -335,7 +335,7 @@ def test_c2c_vpc_peering_missing_account(mocker):
             requester_cluster,
             accepter_connection,
             accepter_cluster,
-            ocm,  # type: ignore
+            ocm,
         )
     assert str(ex.value).startswith("[no_account_available]")
 

reconcile/utils/ocm/ocm.py

@@ -85,6 +85,7 @@ SPEC_ATTR_LOAD_BALANCERS = "load_balancers"
 SPEC_ATTR_STORAGE = "storage"
 SPEC_ATTR_ID = "id"
 SPEC_ATTR_EXTERNAL_ID = "external_id"
+SPEC_ATTR_OIDC_ENDPONT_URL = "oidc_endpoint_url"
 SPEC_ATTR_PROVISION_SHARD_ID = "provision_shard_id"
 SPEC_ATTR_VERSION = "version"
 SPEC_ATTR_INITIAL_VERSION = "initial_version"
@@ -341,6 +342,7 @@ class OCMProductRosa(OCMProduct):
         SPEC_ATTR_HYPERSHIFT,
         SPEC_ATTR_SUBNET_IDS,
         SPEC_ATTR_AVAILABILITY_ZONES,
+        SPEC_ATTR_OIDC_ENDPONT_URL,
     }
 
     @staticmethod
@@ -380,6 +382,7 @@ class OCMProductRosa(OCMProduct):
             provision_shard_id = None
 
         sts = None
+        oidc_endpoint_url = None
         if cluster["aws"].get("sts", None):
             sts = ROSAOcmAwsStsAttrs(
                 installer_role_arn=cluster["aws"]["sts"]["role_arn"],
@@ -391,6 +394,7 @@ class OCMProductRosa(OCMProduct):
                     "worker_role_arn"
                 ],
             )
+            oidc_endpoint_url = cluster["aws"]["sts"]["oidc_endpoint_url"]
         account = ROSAClusterAWSAccount(
             uid=cluster["properties"]["rosa_creator_arn"].split(":")[4],
             rosa=ROSAOcmAwsAttrs(
@@ -417,6 +421,7 @@ class OCMProductRosa(OCMProduct):
             hypershift=cluster["hypershift"]["enabled"],
             subnet_ids=cluster["aws"].get("subnet_ids"),
             availability_zones=cluster["nodes"].get("availability_zones"),
+            oidc_endpoint_url=oidc_endpoint_url,
         )
 
         machine_pools = [