potiuk commented on PR #69611:
URL: https://github.com/apache/airflow/pull/69611#issuecomment-5146318075
Following up on my approval — the merge is blocked and it needs more than a
routine rebase, so flagging exactly what changed.
The bug is **still present on `main`**, so this fix is still wanted. But
`_TimeoutK8sApiClient` and `_TimeoutAsyncK8sApiClient` have **moved out of
`hooks/kubernetes.py` into `kube_client.py`** since you opened this. The
`setdefault` calls now live at
`providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_client.py`
lines ~83 and ~99, reformatted across several lines:
```python
kwargs.setdefault(
"_request_timeout", _get_request_timeout(timeout_seconds)
) # client-side timeout
```
This branch is ~559 commits behind `main` and currently conflicts, so git
can't carry the change across on its own — the fix needs re-applying at the new
location rather than rebased in place.
Nothing about the change itself needs revisiting: coercing on `is None`
instead of relying on `setdefault` is correct, and your tests (explicit-`None`
-> default, explicit-tuple -> preserved, on both clients) are exactly the right
coverage. If the tests have moved too, they're still in
`tests/unit/cncf/kubernetes/hooks/test_kubernetes.py`.
Ping me once it's rebased and I'll re-review promptly — this is worth
landing.
---
Drafted-by: Claude Code (Opus 5); reviewed by @potiuk before posting
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
