Skip to content

Handle missing container_statuses in pod_manager.get_container_status #47936

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
jscheffl merged 2 commits into from
Mar 26, 2025
Merged

Handle missing container_statuses in pod_manager.get_container_status #47936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d06ffe
Add failing example test
ForeverWintr Mar 18, 2025
b9773b1
Handle cases where container_statuses is None
ForeverWintr Mar 18, 2025
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: 6 additions & 4 deletions providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from __future__ import annotations

import enum
import itertools
import json
import math
import time
Expand Down Expand Up @@ -119,9 +118,12 @@ def get_xcom_sidecar_container_resources(self) -> str | None:
def get_container_status(pod: V1Pod, container_name: str) -> V1ContainerStatus | None:
"""Retrieve container status."""
if pod and pod.status:
container_statuses = itertools.chain(
pod.status.container_statuses, pod.status.init_container_statuses
)
container_statuses = []
if pod.status.container_statuses:
container_statuses.extend(pod.status.container_statuses)
if pod.status.init_container_statuses:
container_statuses.extend(pod.status.init_container_statuses)

else:
container_statuses = None

Expand Down
6 changes: 6 additions & 0 deletions providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,12 @@ def container(name, succeeded):
pod_mock_list.append(pytest.param(p, False, id="None remote_pod.status"))
p = RemotePodMock()
p.status = RemotePodMock()
p.status.container_statuses = None
p.status.init_container_statuses = []

pod_mock_list.append(pytest.param(p, False, id="None remote_pod.status.container_statuses"))
p = RemotePodMock()
p.status = RemotePodMock()
p.status.container_statuses = []
p.status.init_container_statuses = []
pod_mock_list.append(pytest.param(p, False, id="empty remote_pod.status.container_statuses"))
Expand Down