github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74301 from frapposelli/fix-return-on-error

Browse Source 
Do not return error on invalid MAC address in vSphere Cloud Provider
This commit is contained in:
Kubernetes Prow Robot 2019-02-20 23:56:25 -08:00 committed by GitHub
commit d9504f1635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cloudprovider/providers/vsphere/vsphere.go
View File

@ -569,7 +569,8 @@ func getLocalIP() ([]v1.NodeAddress, error) {
vmMACAddr := strings.ToLower(i.HardwareAddr.String()) vmMACAddr := strings.ToLower(i.HardwareAddr.String())
// Making sure that the MAC address is long enough // Making sure that the MAC address is long enough
if len(vmMACAddr) < 17 { if len(vmMACAddr) < 17 {
return addrs, fmt.Errorf("MAC address %q is invalid", vmMACAddr) klog.V(4).Infof("Skipping invalid MAC address: %q", vmMACAddr)
continue
} }
if vmwareOUI[vmMACAddr[:8]] { if vmwareOUI[vmMACAddr[:8]] {
nodehelpers.AddToNodeAddresses(&addrs, nodehelpers.AddToNodeAddresses(&addrs,