Skip to content

more tweaks to the hotfix script #2553

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
k8s-ci-robot merged 3 commits into from
May 5, 2026
+5 −5
Merged

more tweaks to the hotfix script #2553

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
768ade9
removed two imports
yliaog May 4, 2026
0d2d174
added back the two imports
yliaog May 4, 2026
73c645e
more tweaks to the hotfix script, the original no_proxy commit cannot…
yliaog May 4, 2026
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: 5 additions & 5 deletions scripts/apply-hotfixes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down