mirror of
https://github.com/outbackdingo/kubernetes.git
synced 2026-02-15 15:30:34 +00:00
af1450df24
Automatic merge from submit-queue (batch tested with PRs 65152, 65199, 65179, 64598, 65216). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Do not query for VMUUID in vsphere cloud provider if it was explicitly passed **What this PR does / why we need it**: It allows running the kube controller-manager with the vsphere cloudprovider enabled on a machine that is not a vmware VM **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #65145 **Special notes for your reviewer**: **Release note**: ```release-note In the vSphere cloud provider the `Global.vm-uuid` configuration option is not deprecated anymore, it can be used to overwrite the VMUUID on the controller-manager ``` /sig vmware