Merge pull request #2606 from yliaog/master

apply hotfix for bearer-token fallback in Configuration.auth_settings

Author: k8s-ci-robot

scripts/apply-hotfixes.sh

@@ -89,4 +89,15 @@ else
     exit 1
 fi;
 
+# Patching commit for bearer-token fallback in Configuration.auth_settings
+git cherry-pick -n 5621a4c2cf5cc278e8f45ce759ce44c057f1dbe2
+if [ $? -eq 0 ]
+then
+    echo Successfully patched changes for bearer-token fallback in Configuration.auth_settings
+else
+    echo Failed to patch changes for bearer-token fallback in Configuration.auth_settings
+    git restore --staged .
+    exit 1
+fi;
+
 git commit -m "Apply hotfixes"

scripts/release.sh

@@ -207,6 +207,10 @@ git diff-index --quiet --cached HEAD || git commit -am "update changelog"
 
 # Re-generate the client
 scripts/update-client.sh
+
+# Re-generate the asyncio client
+scripts/update-client-asyncio.sh
+
 # Apply hotfixes
 rm -r kubernetes/test/
 git add .
@@ -223,9 +227,6 @@ if [[ -n "$(git diff kubernetes/client/api/custom_objects_api.py)" ]]; then
   git commit -m "generated client change for custom_objects"
 fi
 
-# Re-generate the asyncio client
-scripts/update-client-asyncio.sh
-
 # Check if there is any API change, then commit
 git add kubernetes/docs kubernetes/client/api/ kubernetes/client/models/ kubernetes/swagger.json.unprocessed scripts/swagger.json
 git add kubernetes/aio/docs kubernetes/aio/client/api/ kubernetes/aio/client/models/ kubernetes/aio/swagger.json.unprocessed