From 768ade93984b4a203bab6d7e8cdf13b0b90e030e Mon Sep 17 00:00:00 2001 From: yliao Date: Mon, 4 May 2026 22:00:33 +0000 Subject: [PATCH 1/3] removed two imports --- kubernetes/test/test_api_client.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/kubernetes/test/test_api_client.py b/kubernetes/test/test_api_client.py index 9252172f5b..5c57be212a 100644 --- a/kubernetes/test/test_api_client.py +++ b/kubernetes/test/test_api_client.py @@ -6,8 +6,6 @@ import unittest import kubernetes -from kubernetes.client.configuration import Configuration -import urllib3 class TestApiClient(unittest.TestCase): From 0d2d174206a743b672dd3181f74932d7c96bed82 Mon Sep 17 00:00:00 2001 From: yliao Date: Mon, 4 May 2026 22:01:34 +0000 Subject: [PATCH 2/3] added back the two imports --- kubernetes/test/test_api_client.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubernetes/test/test_api_client.py b/kubernetes/test/test_api_client.py index 5c57be212a..9252172f5b 100644 --- a/kubernetes/test/test_api_client.py +++ b/kubernetes/test/test_api_client.py @@ -6,6 +6,8 @@ import unittest import kubernetes +from kubernetes.client.configuration import Configuration +import urllib3 class TestApiClient(unittest.TestCase): From 73c645e013914b5dff9001b8f01a192d944c0554 Mon Sep 17 00:00:00 2001 From: yliao Date: Mon, 4 May 2026 22:13:23 +0000 Subject: [PATCH 3/3] more tweaks to the hotfix script, the original no_proxy commit cannot be used due to conflict, the new no_proxy commit was missing two imports --- scripts/apply-hotfixes.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/apply-hotfixes.sh b/scripts/apply-hotfixes.sh index 99f5cd4494..56cffde1fc 100755 --- a/scripts/apply-hotfixes.sh +++ b/scripts/apply-hotfixes.sh @@ -68,7 +68,7 @@ fi; # UPDATE: The commit being cherry-picked is updated kubernetes/client/ unless OpenAPI generator v5.3.1 involved (offinical support of no_proxy feature). # Ref: https://github.com/kubernetes-client/python/pull/1579/commits/95a893cd1c34de11a4e3893dd1dfde4a0ca30bdc and conversations in the PR. # UPDATE: The commit being cherry-picked is updated after upgrading openapi-generator to v6.6.0. -git cherry-pick -n 95a893cd1c34de11a4e3893dd1dfde4a0ca30bdc d8c380e8bdef99e14c7a0e5a8ee216af370a10d8 +git cherry-pick -n c5939ff3ae82b4cb711208af682f7395297fe751 0d2d174206a743b672dd3181f74932d7c96bed82 if [ $? -eq 0 ] then echo Successfully patched changes for no_proxy support @@ -78,13 +78,13 @@ else exit 1 fi; -# Patching commit for test_informer and test_metrics -git cherry-pick -n b5f4b4cc504e7f10956b52de6aa676e22c8952f0 +# Patching commit for test_api_client.py, test_informer and test_metrics +git cherry-pick -n b5f4b4cc504e7f10956b52de6aa676e22c8952f0 d8c380e8bdef99e14c7a0e5a8ee216af370a10d8 if [ $? -eq 0 ] then - echo Successfully patched changes for test_informer and test_metrics + echo Successfully patched changes for test_api_client.py, test_informer and test_metrics else - echo Failed to patch changes for test_informer and test_metrics + echo Failed to patch changes for test_api_client.py, test_informer and test_metrics git restore --staged . exit 1 fi;