Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 47768af

Browse files
committed
Update the hotfix script
Signed-off-by: Nabarun Pal <[email protected]>
1 parent da2579a commit 47768af

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

scripts/apply-hotfixes.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ if ! [[ $GIT_BRANCH =~ .*release-.* ]]; then
3535
fi
3636

3737
# Patching commit for custom client behavior
38+
# UPDATE: The commit being cherry-picked is updated since the the client generated in 1adaaecd0879d7315f48259ad8d6cbd66b835385
39+
# differs from the initial hotfix
3840
# Ref: https://github.com/kubernetes-client/python/pull/995/commits/9959273625b999ae9a8f0679c4def2ee7d699ede
39-
git cherry-pick -n 9959273625b999ae9a8f0679c4def2ee7d699ede
41+
git cherry-pick -n a138dcbb7a9da972402a847ce982b027e0224e60
4042
if [ $? -eq 0 ]
4143
then
4244
echo Succesfully patched changes for custom client behavior
@@ -47,8 +49,9 @@ else
4749
fi
4850

4951
# Patching commits for enabling from kubernetes import apis
52+
# UPDATE: The commit being cherry-picked is updated to include both the commits as one
5053
# Ref: https://github.com/kubernetes-client/python/blob/0976d59d6ff206f2f428cabc7a6b7b1144843b2a/kubernetes/client/apis/__init__.py
51-
git cherry-pick -n dee078639b5e848db73232397087a81f1a336510 b3164930dd1789dd66915acd6772f92f512cec47
54+
git cherry-pick -n 228a29a982aee922831c3af4fef66a7846ce4bb8
5255
if [ $? -eq 0 ]
5356
then
5457
echo Succesfully patched changes for enabling from kubernetes import apis
@@ -59,8 +62,9 @@ else
5962
fi;
6063

6164
# Patching commits for Client Context Manager
65+
# UPDATE: OpenAPI generator v4.3.0 has the context manager as a functionality. Cherry-picking just the tests for completeness.
6266
# Ref: https://github.com/kubernetes-client/python/pull/1073
63-
git cherry-pick -n 18d21df367bf9ab5554635f5c6d107f2cf2206a5 13dffb897617f87aaaee247095107d7011e002d5
67+
git cherry-pick -n 13dffb897617f87aaaee247095107d7011e002d5
6468
if [ $? -eq 0 ]
6569
then
6670
echo Succesfully patched changes for Client Context Manager

0 commit comments

Comments
 (0)