Skip to content

CherryPicked: [cnv-4.18] [IUO]fix: Catch NotFoundError when pods are deleted during iteration #4431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rnetser merged 1 commit into from
Apr 16, 2026
+3 −7
Merged

CherryPicked: [cnv-4.18] [IUO]fix: Catch NotFoundError when pods are deleted during iteration #4431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions tests/install_upgrade_operators/node_component/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import logging
from collections import defaultdict

from kubernetes.client.rest import ApiException
from kubernetes.dynamic.exceptions import NotFoundError, ResourceNotFoundError
from kubernetes.dynamic.exceptions import NotFoundError
Comment thread
albarker-rh marked this conversation as resolved.
from ocp_resources.pod import Pod
from ocp_resources.resource import ResourceEditor
from timeout_sampler import TimeoutExpiredError, TimeoutSampler
Expand Down Expand Up @@ -354,11 +353,8 @@ def _get_pods_per_nodes(_filter_pods_by_name):
# to filter out terminating pods, see: https://github.com/kubernetes/kubectl/issues/450
if pod.instance.metadata.get("deletionTimestamp") is None:
pods_per_nodes[pod.node.name].append(pod)
except ApiException as ex:
if ex.reason == ResourceNotFoundError:
LOGGER.debug(
f"Ignoring pods that disappeared during the query. node={pod.node.name} pod={pod.name}"
)
except NotFoundError:
LOGGER.warning(f"Ignoring pods that disappeared during the query. node={pod.node.name} pod={pod.name}")
return pods_per_nodes

pod_names_per_nodes = {}
Expand Down
Loading