qontract-reconcile 0.10.1rc68__py3-none-any.whl → 0.10.1rc70__py3-none-any.whl

{qontract_reconcile-0.10.1rc68.dist-info → qontract_reconcile-0.10.1rc70.dist-info}/METADATA

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

@@ -124,9 +124,9 @@ reconcile/aus/advanced_upgrade_service.py,sha256=xWu2oq1ouSkw0ZMoX40cmj_6W6MuWpc
 reconcile/aus/base.py,sha256=qoj4Hv4r1x5WfzwImSC_Yw8G7dTDwvAVm9B_UCeEM4k,32119
 reconcile/aus/metrics.py,sha256=QLzmIpXh3Pxddfz9KyaiupLJZQnxjwVz04YfhpVLhQk,1637
 reconcile/aus/models.py,sha256=kRrs276iJClnNnEeWnJma2Gvx8E9kes77I_XbgKoVzk,4722
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=UjKFUeomkVpwVVkejPfNBMN7CQywIs5uOipUckfI8Y0,7659
+reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=7fQwapwIWP7kk8oR1svBB7mgPj5qg1Gi3h7xGyt2sJ0,7872
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=2bGRTJwjOf7O23tpuom41azxN1TZhrD8xs1jPpbaXLk,5193
-reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=tH0oQFJsO4UrEYspqiq-ne6-ULXA4NLY3g3hxaJKGEA,2867
+reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=cCm7WkMeI1ghnoYGGaZshEiUoY6_w2iMYXzeFsmPAqg,2896
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_ami_cleanup/integration.py,sha256=32QffasmsfA3IlCozh5d9LwYolKw4WY4PHCDr_-33c0,8792
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -384,7 +384,7 @@ reconcile/test/test_utils_metrics.py,sha256=1GDG23ek7jV3Fo0vCMrptWbH6T3qTPDSp9Za
 reconcile/test/test_utils_models.py,sha256=9sY44ASmjzr342PImiUWl68It7XgksIaB08vZrD6jsw,10869
 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=k3PwZ8QpJ0x4vSh2tX1Zov2oObauxYnfZ-gPQUmbj0Q,33590
+reconcile/test/test_utils_oc.py,sha256=qZEesUct3Hhf0NT-STJlvQlXLSBSSe9WRxw_DO6VGo0,35903
 reconcile/test/test_utils_ocm.py,sha256=0oI2kTetsHLPdGKZbIZBDr1rJK7MAZ0jIC4Y0OnUXag,3348
 reconcile/test/test_utils_pagerduty_api.py,sha256=nGudGdVgruBRh1btuJ28CFaJTFqchHfsp2JnXY-_5Oo,7827
 reconcile/test/test_utils_parse_dhms_duration.py,sha256=OyTzWqU8QYNvr31dWrnWFVNHvRBqU2agR5fbQbnS4OU,753
@@ -500,7 +500,7 @@ reconcile/utils/lean_terraform_client.py,sha256=no9MMgG6TsgjM3EypIhLQtRmPZl9eNnZ
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=nKywg_TBGhpCyVnJnp4UtV63xplsH8hid0NlmrluVwM,13962
 reconcile/utils/models.py,sha256=0Y8HOYdL7tk4WUcRI59EQ9lMKeLmE2L1wwYAlpEjgSg,4774
-reconcile/utils/oc.py,sha256=gLGMhrXVDRUonesMM5HTIuL7f_2_6DQCvC1I_wTCA9E,64454
+reconcile/utils/oc.py,sha256=AIkBSXLnsJCE_9HCMN66-QK359pMBNPs4Q2XPI9zjyU,64780
 reconcile/utils/oc_connection_parameters.py,sha256=mUP0WtpozdFDufcdNKy2OGweRvI3Faq8YLiR0ngJYes,9799
 reconcile/utils/oc_filters.py,sha256=RWn8pC5A7ZZT7C6WPq9bOw5KBNkiAb5puFSr_FpdAf8,1358
 reconcile/utils/oc_map.py,sha256=nT69J5pdPeIDnIYjD9fwY6GkE3BMQCf-AF0rmHJuUNw,9068
@@ -590,8 +590,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.10.1rc68.dist-info/METADATA,sha256=vj9ne6Mbdqt-ksxbp89u0tdvasQJ58MZiLqv6s_XumY,2290
-qontract_reconcile-0.10.1rc68.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc68.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc68.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc68.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc70.dist-info/METADATA,sha256=DKCL0AtninblHvju2MBH3JYnMQOZZ7yHqlgqpumfbtM,2290
+qontract_reconcile-0.10.1rc70.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc70.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc70.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc70.dist-info/RECORD,,

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -117,6 +117,9 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
                 upgradePolicy=cluster.upgrade_policy,
             )
             for cluster in org.upgrade_policy_clusters or []
+            # clusters that are not in the UUID dict will be ignored because
+            # they don't exist in the OCM organization (or have been deprovisioned)
+            if cluster.name in cluster_name_to_uuid
         ]
 
     def expose_org_upgrade_spec_metrics(

reconcile/aus/ocm_upgrade_scheduler_org.py

@@ -72,6 +72,6 @@ class OCMClusterUpgradeSchedulerOrgIntegration(OCMClusterUpgradeSchedulerIntegra
             )
             for cluster in org.upgrade_policy_clusters or []
             # clusters that are not in the UUID dict will be ignored because
-            # they don't exist in the OCM organization
+            # they don't exist in the OCM organization (or have been deprovisioned)
             if cluster.name in cluster_name_to_uuid
         ]

reconcile/test/test_utils_oc.py

@@ -573,9 +573,9 @@ class TestOCMapGetClusters(TestCase):
 
 
 @pytest.fixture
-def oc(monkeypatch):
+def oc_cli(monkeypatch) -> OCCli:
     monkeypatch.setenv("USE_NATIVE_CLIENT", "False")
-    return OC("cluster", "server", "token", local=True)
+    return OC("cluster", "server", "token", local=True)  # type: ignore[return-value]
 
 
 @pytest.fixture
@@ -620,44 +620,44 @@ def pod():
     }
 
 
-def test_get_resources_used_in_pod_spec_unsupported_kind(oc):
+def test_get_resources_used_in_pod_spec_unsupported_kind(oc_cli):
     with pytest.raises(KeyError):
-        oc.get_resources_used_in_pod_spec({}, "Deployment")
+        oc_cli.get_resources_used_in_pod_spec({}, "Deployment")
 
 
-def test_get_resources_used_in_pod_spec_secret(oc, pod):
+def test_get_resources_used_in_pod_spec_secret(oc_cli, pod):
     expected = {"secret1": set(), "secret2": set(), "secret3": {"secretkey3"}}
-    results = oc.get_resources_used_in_pod_spec(pod["spec"], "Secret")
+    results = oc_cli.get_resources_used_in_pod_spec(pod["spec"], "Secret")
     assert results == expected
 
 
-def test_get_resources_used_in_pod_spec_configmap(oc, pod):
+def test_get_resources_used_in_pod_spec_configmap(oc_cli, pod):
     expected = {
         "configmap1": set(),
         "configmap2": set(),
         "configmap3": {"configmapkey3"},
     }
-    results = oc.get_resources_used_in_pod_spec(pod["spec"], "ConfigMap")
+    results = oc_cli.get_resources_used_in_pod_spec(pod["spec"], "ConfigMap")
     assert results == expected
 
 
-def test_secret_used_in_pod_true(oc, pod):
-    result = oc.secret_used_in_pod("secret1", pod)
+def test_secret_used_in_pod_true(oc_cli, pod):
+    result = oc_cli.secret_used_in_pod("secret1", pod)
     assert result is True
 
 
-def test_secret_used_in_pod_false(oc, pod):
-    result = oc.secret_used_in_pod("secret9999", pod)
+def test_secret_used_in_pod_false(oc_cli, pod):
+    result = oc_cli.secret_used_in_pod("secret9999", pod)
     assert result is False
 
 
-def test_configmap_used_in_pod_true(oc, pod):
-    result = oc.configmap_used_in_pod("configmap1", pod)
+def test_configmap_used_in_pod_true(oc_cli, pod):
+    result = oc_cli.configmap_used_in_pod("configmap1", pod)
     assert result is True
 
 
-def test_configmap_used_in_pod_false(oc, pod):
-    result = oc.configmap_used_in_pod("configmap9999", pod)
+def test_configmap_used_in_pod_false(oc_cli, pod):
+    result = oc_cli.configmap_used_in_pod("configmap9999", pod)
     assert result is False
 
 
@@ -897,10 +897,14 @@ def replicasets(deployment):
     ]
 
 
-def test_get_owned_replicasets(mocker, oc: OCNative, deployment):
-    oc__get = mocker.patch.object(oc, "get", autospec=True)
+def test_get_owned_replicasets(
+    mocker,
+    oc_cli: OCCli,
+    deployment,
+):
+    oc__get = mocker.patch.object(oc_cli, "get", autospec=True)
     oc__get_obj_root_owner = mocker.patch.object(
-        oc, "get_obj_root_owner", autospec=True
+        oc_cli, "get_obj_root_owner", autospec=True
     )
     oc__get.return_value = {"items": ["stub1", "stub2", "stub3"]}
     oc__get_obj_root_owner.side_effect = [
@@ -908,40 +912,56 @@ def test_get_owned_replicasets(mocker, oc: OCNative, deployment):
         deployment,
         {"kind": "ownerkind", "metadata": {"name": "notownername"}},
     ]
-    owned_replicasets = oc.get_owned_replicasets("namespace", deployment)
+    owned_replicasets = oc_cli.get_owned_replicasets("namespace", deployment)
     assert len(owned_replicasets) == 2
 
 
-def test_get_replicaset(patch_sleep, mocker, oc: OCNative, deployment, replicasets):
+def test_get_replicaset(
+    patch_sleep,
+    mocker,
+    oc_cli: OCCli,
+    deployment,
+    replicasets,
+):
     oc__get_owned_replicasets = mocker.patch.object(
-        oc, "get_owned_replicasets", autospec=True
+        oc_cli, "get_owned_replicasets", autospec=True
     )
     oc__get_owned_replicasets.return_value = replicasets
 
     assert (
-        oc.get_replicaset("namespace", deployment)["metadata"]["name"]
+        oc_cli.get_replicaset("namespace", deployment)["metadata"]["name"]
         == "busybox-current"
     )
 
 
-def test_get_replicaset_fail(patch_sleep, mocker, oc: OCNative, deployment):
+def test_get_replicaset_fail(
+    patch_sleep,
+    mocker,
+    oc_cli: OCCli,
+    deployment,
+):
     oc__get_owned_replicasets = mocker.patch.object(
-        oc, "get_owned_replicasets", autospec=True
+        oc_cli, "get_owned_replicasets", autospec=True
     )
     oc__get_owned_replicasets.return_value = []
 
     with pytest.raises(ResourceNotFoundError):
         # pylint: disable-next=expression-not-assigned
-        oc.get_replicaset("namespace", deployment)["metadata"]["name"]
+        oc_cli.get_replicaset("namespace", deployment)["metadata"]["name"]
     assert oc__get_owned_replicasets.call_count == GET_REPLICASET_MAX_ATTEMPTS
 
 
-def test_get_replicaset_allow_empty(patch_sleep, mocker, oc: OCNative, deployment):
+def test_get_replicaset_allow_empty(
+    patch_sleep,
+    mocker,
+    oc_cli: OCCli,
+    deployment,
+):
     oc__get_owned_replicasets = mocker.patch.object(
-        oc, "get_owned_replicasets", autospec=True
+        oc_cli, "get_owned_replicasets", autospec=True
     )
     oc__get_owned_replicasets.return_value = []
-    assert oc.get_replicaset("namespace", deployment, allow_empty=True) == {}
+    assert oc_cli.get_replicaset("namespace", deployment, allow_empty=True) == {}
 
 
 @pytest.fixture
@@ -959,11 +979,11 @@ def api_resources():
 
 
 @pytest.fixture
-def oc_api_resources(monkeypatch, mocker, api_resources):
+def oc_api_resources(monkeypatch, mocker, api_resources) -> OCCli:
     monkeypatch.setenv("USE_NATIVE_CLIENT", "False")
     get_api_resources = mocker.patch.object(OCCli, "get_api_resources", autospec=True)
     get_api_resources.return_value = api_resources
-    return OC("cluster", "server", "token", local=True, init_api_resources=True)
+    return OC("cluster", "server", "token", local=True, init_api_resources=True)  # type: ignore[return-value]
 
 
 def test_is_kind_namespaced(oc_api_resources):
@@ -980,3 +1000,71 @@ def test_is_kind_not_namespaced(oc_api_resources):
 
 def test_is_kind_not_namespaced_full_name(oc_api_resources):
     assert not oc_api_resources.is_kind_namespaced("kind2.group2")
+
+
+@pytest.fixture
+def oc_native(
+    monkeypatch,
+    mocker,
+    api_resources: dict,
+) -> OCNative:
+    monkeypatch.setenv("USE_NATIVE_CLIENT", "True")
+    get_api_resources = mocker.patch.object(OCCli, "get_api_resources", autospec=True)
+    get_api_resources.return_value = api_resources
+    mocker.patch.object(OCNative, "_get_client", autospec=True)
+    return OC("cluster", "server", "token", local=True)  # type: ignore[return-value]
+
+
+def test_oc_native_get(oc_native: OCNative) -> None:
+    oc_native.get("namespace", "kind1", "name")
+
+    oc_native.client.resources.get.assert_called_once_with(
+        api_version="group1/v1",
+        kind="kind1",
+    )
+    oc_native.client.resources.get.return_value.get.assert_called_once_with(
+        namespace="namespace",
+        name="name",
+        _request_timeout=60,
+    )
+
+
+def test_oc_native_get_items(oc_native: OCNative) -> None:
+    oc_native.get_items("kind1", labels={"label1": "value1"})
+
+    oc_native.client.resources.get.assert_called_once_with(
+        api_version="group1/v1",
+        kind="kind1",
+    )
+    oc_native.client.resources.get.return_value.get.assert_called_once_with(
+        namespace="",
+        label_selector="label1=value1",
+        _request_timeout=60,
+    )
+
+
+def test_oc_native_get_items_with_resource_names(oc_native: OCNative) -> None:
+    oc_native.get_items("kind1", labels={"label1": "value1"}, resource_names=["name"])
+
+    oc_native.client.resources.get.assert_called_once_with(
+        api_version="group1/v1",
+        kind="kind1",
+    )
+    oc_native.client.resources.get.return_value.get.assert_called_once_with(
+        namespace="",
+        name="name",
+        label_selector="label1=value1",
+        _request_timeout=60,
+    )
+
+
+def test_oc_native_get_all(oc_native: OCNative) -> None:
+    oc_native.get_all("kind1")
+
+    oc_native.client.resources.get.assert_called_once_with(
+        api_version="group1/v1",
+        kind="kind1",
+    )
+    oc_native.client.resources.get.return_value.get.assert_called_once_with(
+        _request_timeout=60,
+    )

reconcile/utils/oc.py

@@ -1194,6 +1194,9 @@ class OCCli:  # pylint: disable=too-many-public-methods
         return kind_resources[0].namespaced
 
 
+REQUEST_TIMEOUT = 60
+
+
 class OCNative(OCCli):
     def __init__(
         self,
@@ -1322,7 +1325,10 @@ class OCNative(OCCli):
             for resource_name in resource_names:
                 try:
                     item = obj_client.get(
-                        name=resource_name, namespace=namespace, label_selector=labels
+                        name=resource_name,
+                        namespace=namespace,
+                        label_selector=labels,
+                        _request_timeout=REQUEST_TIMEOUT,
                     )
                     if item:
                         items.append(item.to_dict())
@@ -1331,7 +1337,9 @@ class OCNative(OCCli):
             items_list = {"items": items}
         else:
             items_list = obj_client.get(
-                namespace=namespace, label_selector=labels
+                namespace=namespace,
+                label_selector=labels,
+                _request_timeout=REQUEST_TIMEOUT,
             ).to_dict()
 
         items = items_list.get("items")
@@ -1345,7 +1353,11 @@ class OCNative(OCCli):
         k, group_version = self._parse_kind(kind)
         obj_client = self._get_obj_client(group_version=group_version, kind=k)
         try:
-            obj = obj_client.get(name=name, namespace=namespace)
+            obj = obj_client.get(
+                name=name,
+                namespace=namespace,
+                _request_timeout=REQUEST_TIMEOUT,
+            )
             return obj.to_dict()
         except NotFoundError as e:
             if allow_not_found:
@@ -1356,7 +1368,7 @@ class OCNative(OCCli):
         k, group_version = self._parse_kind(kind)
         obj_client = self._get_obj_client(group_version=group_version, kind=k)
         try:
-            return obj_client.get().to_dict()
+            return obj_client.get(_request_timeout=REQUEST_TIMEOUT).to_dict()
         except NotFoundError as e:
             raise StatusCodeError(f"[{self.server}]: {e}")