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.
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
Fix kube vsphere.kerneltime #34997
Fix kube vsphere.kerneltime #34997
Conversation
Use ComputeResource instead of ClusterComputeResource when initializing the vSphere Cloud Provider
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
This doesn't look like the same set of changes you had in #34993. Were those changes already in another PR? If so, you'll need to cherry-pick them both (and you may want to note that on the other PR). https://github.com/kubernetes/kubernetes/blob/master/docs/devel/cherry-picks.md |
Removing label |
@zmerlynn Those changes are already part of the master. So with these 2 commits the master will have all the commits that were part of #34993 A longer explanation, #34993 was a combination of 3 cherry-picks and 2 new commits. Thus, when targeting the change for master I only need 2 commits (here) since the 3 were already in (#31467) |
Understood. This PR does need to be cherry picked. I will request the other PR (#31467) to be cherry picked as well. Thank you! |
@kerneltime "cherrypick-candidate" and milestone 1.4 should suffice I believe. Once the tests pass adding a cherrypick-approved will tag this for cherrypicking into 1.4 release |
For #31467 and this PR I do not have ability to change labels or tag.. |
@kerneltime if you can't add labels, please request that your reviewer add them for you. |
@kerneltime: After this PR gets merged and cherrypick approved, you can propose the cherrypick yourself (see the link from #34997 (comment)). You can roll multiple PRs into one cherrypick, so in this case, you'd do e.g.:
This PR should go in shortly. I labeled it as |
@zmerlynn Got it. Thank you! |
Automatic merge from submit-queue |
Cherry pick PR #35059 |
…-of-#31467-kubernetes#34997-origin-release-1.4 Automatic merge from submit-queue Automated cherry pick of kubernetes#31467 kubernetes#34997 Cherry pick of kubernetes#31467 kubernetes#34997 on release-1.4 kubernetes#34997: Fix kube vsphere.kerneltime kubernetes#31467: Add support for vpshere cloud provider in kubeup Ref: 34997 for discussion.
What this PR does / why we need it:
This fixes kube-up to correctly install and configure on vSphere and avoid panics when only a single ESX(hypervisor) is used instead of a cluster.
Which issue this PR fixes
fixes #34992
fixes #34847
Special notes for your reviewer:
We plan to cherry pick this into 1.4 release branch as well Ref: #34993
This change is