This repository has been archived by the owner on Sep 7, 2022. It is now read-only.
Report InstanceID for vSphere Cloud Provider as UUID from product_serial file #452
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pshahzeb
approved these changes
Feb 6, 2018
| if !strings.HasPrefix(uuid, UUIDPrefix) { | ||
| return "", fmt.Errorf("Failed to match Prefix, UUID read from the file is %v", uuidFromFile) | ||
| } | ||
| // Strip the prefix and while spaces and - |
| } | ||
|
|
||
| func GetUUIDFromProviderID(providerID string) string { | ||
| return strings.TrimPrefix(providerID, ProviderPrefix) |
There was a problem hiding this comment.
Confirming the need for GetUUIDFromProviderID. Is ProviderPrefix automatically added to uuid returned by func InstanceID()?
There was a problem hiding this comment.
Yes, it is added for all cloudproviders
abrarshivani
force-pushed
the
vm_uuid_provider_id
branch
2 times, most recently
from
b3c1da9 to
4fe36f0
Compare
divyenpatel
approved these changes
Feb 8, 2018
| @@ -43,6 +44,9 @@ const ( | |||
| Folder = "Folder" | |||
| VirtualMachine = "VirtualMachine" | |||
| DummyDiskName = "kube-dummyDisk.vmdk" | |||
| UUIDPath = "/sys/class/dmi/id/product_serial" | |||
| UUIDPrefix = "VMware-" | |||
| ProviderPrefix = "vsphere://" | |||
abrarshivani
force-pushed
the
vm_uuid_provider_id
branch
from
4fe36f0 to
918e47c
Compare
k8s-github-robot
pushed a commit
to kubernetes/kubernetes
that referenced
this pull request
Feb 8, 2018
Automatic merge from submit-queue. 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>. Report InstanceID for vSphere Cloud Provider as UUID obtained from product_serial file **What this PR does / why we need it**: vSphere Cloud Provider is not able to find the nodes for VMs created on vSphere v1.6.5. Kubelet fetches SystemUUID from file ```/sys/class/dmi/id/product_uuid```. vSphere Cloud Provider uses this uuid as VM identifier to get node information from vCenter. vCenter v1.6.5 doesn't recognize this uuids, as a result, nodes are not found. UUID present in file ```/sys/class/dmi/id/product_serial``` is recognized by vCenter. Yet, Kubelet doesn't report this. Therefore, in this PR InstanceID is reported as UUID which is fetched from file ```/sys/class/dmi/id/product_serial```. **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 #58927 **Special notes for your reviewer**: Internally review here: vmware-archive#452 Tested: Launched K8s cluster using kubeadm (Used Ubuntu VM compatible with vSphere version 6.5.) _**Note: Installed Ubuntu from ISO**_ Observed following: ``` Master > cat /sys/class/dmi/id/product_uuid 743F0E42-84EA-A2F9-7736-6106BB5DBF6B > cat /sys/class/dmi/id/product_serial VMware-42 0e 3f 74 ea 84 f9 a2-77 36 61 06 bb 5d bf 6b Node > cat /sys/class/dmi/id/product_uuid 956E0E42-CC9D-3D89-9757-F27CEB539B76 > cat /sys/class/dmi/id/product_serial VMware-42 0e 6e 95 9d cc 89 3d-97 57 f2 7c eb 53 9b 76 ``` With this fix controller manager was able to find the nodes. **controller manager logs** ``` {"log":"I0205 22:43:00.106416 1 nodemanager.go:183] Found node ubuntu-node as vm=VirtualMachine:vm-95 in vc=10.161.120.115 and datacenter=vcqaDC\n","stream":"stderr","time":"2018-02-05T22:43:00.421010375Z"} ``` **Release note**: ```release-note vSphere Cloud Provider supports VMs provisioned on vSphere v1.6.5 ```
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this fix, if VM was created on vSphere v1.6.5 then VCP was not able to find the nodes. Since VCP was finding VMs based on UUID which was reported by Kubelet as SystemUUID. Kubelet fetched SystemUUID from file
/sys/class/dmi/id/product_uuid. For VMs created on vSphere 1.6.5. product_uuid is not same uuid identified by VC. Yet,/sys/class/dmi/id/product_serialcontains VM uuid which is identified by VC. Hence, this PR fixes this issue by reporting the uuid fetched from product_serial.What this PR does / why we need it:
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 #450
Special notes for your reviewer:
Release note:
Tested:
a. Created Ubuntu VM with compatible with vSphere version 6.5. (Note: Installed Ubuntu from ISO)
b. Observed following:
c. With this fix controller manager was able to find the nodes.
controller manager logs