From 292d65af85a96f4801908930acfbeafbb3be9efb Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sat, 6 Dec 2025 11:10:51 +0100 Subject: [PATCH] [v3-1-test] Limit urllib3 to <2.6.0 during latest boto tests (#59130) This is follow up after #59108 as latest boto tests might upgrade urllib3. (cherry picked from commit 40ee29ce3cd00ddd30ed9a2a9bd743b5f51fbd3b) Co-authored-by: Jarek Potiuk --- Dockerfile.ci | 6 +++++- scripts/docker/entrypoint_ci.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index a97dcafb9c83a..ff7b2524fc74b 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1324,8 +1324,12 @@ function check_boto_upgrade() { echo # shellcheck disable=SC2086 ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs || true + + # Urllib 2.6.0 breaks kubernetes client because kubernetes client uses deprecated in 2.0.0 and + # removed in 2.6.0 `getheaders()` call (instead of `headers` property. + # Tracked in https://github.com/kubernetes-client/python/issues/2477 # shellcheck disable=SC2086 - ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade "boto3<1.38.3" "botocore<1.38.3" + ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade "boto3<1.38.3" "botocore<1.38.3" "urllib3<2.6.0" } function check_upgrade_sqlalchemy() { diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh index 28fd630096688..dabb4a59eff3d 100755 --- a/scripts/docker/entrypoint_ci.sh +++ b/scripts/docker/entrypoint_ci.sh @@ -303,8 +303,12 @@ function check_boto_upgrade() { echo # shellcheck disable=SC2086 ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs || true + + # Urllib 2.6.0 breaks kubernetes client because kubernetes client uses deprecated in 2.0.0 and + # removed in 2.6.0 `getheaders()` call (instead of `headers` property. + # Tracked in https://github.com/kubernetes-client/python/issues/2477 # shellcheck disable=SC2086 - ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade "boto3<1.38.3" "botocore<1.38.3" + ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade "boto3<1.38.3" "botocore<1.38.3" "urllib3<2.6.0" } # Upgrade sqlalchemy to the latest version to run tests with it