From 9a2fbde41b6a1ecde2ec8c0795fee278c0b1f294 Mon Sep 17 00:00:00 2001 From: Jason Price Date: Mon, 21 Jun 2021 13:57:24 -0400 Subject: [PATCH 1/2] update the hotfix script for tolerating null sources on projected volumes --- scripts/apply-hotfixes.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/apply-hotfixes.sh b/scripts/apply-hotfixes.sh index 4d84203c4..773efb40a 100755 --- a/scripts/apply-hotfixes.sh +++ b/scripts/apply-hotfixes.sh @@ -74,4 +74,17 @@ else exit 1 fi; +# Patching commits for Tolerating Null Sources on Projected Volumes +# UPDATE: OpenAPI generator v4.3.0 has the context manager as a functionality. Cherry-picking just the tests for completeness. +# Ref: https://github.com/kubernetes-client/python/pull/1497 +git cherry-pick -n f3dbc8cbf1ab2aaf5e3bd8c0f0fc068e67823971 +if [ $? -eq 0 ] +then + echo Succesfully patched changes for Tolerating Null Sources on Projected Volumes +else + echo Failed to patch changes for Tolerating Null Sources on Projected Volumes + git restore --staged . + exit 1 +fi; + git commit -m "Apply hotfixes" From 29729af6a0b8f1aa25d6c366ea074f075af63622 Mon Sep 17 00:00:00 2001 From: Jason Price Date: Wed, 23 Jun 2021 18:10:01 -0400 Subject: [PATCH 2/2] address PR comment around removing hotfix when v20 clients are released --- scripts/apply-hotfixes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apply-hotfixes.sh b/scripts/apply-hotfixes.sh index 773efb40a..2013315a3 100755 --- a/scripts/apply-hotfixes.sh +++ b/scripts/apply-hotfixes.sh @@ -75,7 +75,7 @@ else fi; # Patching commits for Tolerating Null Sources on Projected Volumes -# UPDATE: OpenAPI generator v4.3.0 has the context manager as a functionality. Cherry-picking just the tests for completeness. +# TODO: remove this patch when we release v20 clients # Ref: https://github.com/kubernetes-client/python/pull/1497 git cherry-pick -n f3dbc8cbf1ab2aaf5e3bd8c0f0fc068e67823971 if [ $? -eq 0 ]