Skip to content

Commit

Permalink
Merge pull request #66147 from dougm/automated-cherry-pick-of-#66007-…
Browse files Browse the repository at this point in the history
…upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #66007: Return vmUUID when renewing nodeinfo in VCP

Cherry pick of #66007 on release-1.11.

#66007: Return vmUUID when renewing nodeinfo in VCP

```release-note
Preserve vmUUID when renewing nodeinfo in vSphere cloud provider
```
  • Loading branch information
Kubernetes Submit Queue committed Jul 19, 2018
2 parents 30ab909 + b10e093 commit 248728c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pkg/cloudprovider/providers/vsphere/nodemanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,12 @@ func (nm *NodeManager) renewNodeInfo(nodeInfo *NodeInfo, reconnect bool) (*NodeI
}
}
vm := nodeInfo.vm.RenewVM(vsphereInstance.conn.Client)
return &NodeInfo{vm: &vm, dataCenter: vm.Datacenter, vcServer: nodeInfo.vcServer}, nil
return &NodeInfo{
vm: &vm,
dataCenter: vm.Datacenter,
vcServer: nodeInfo.vcServer,
vmUUID: nodeInfo.vmUUID,
}, nil
}

func (nodeInfo *NodeInfo) VM() *vclib.VirtualMachine {
Expand Down

0 comments on commit 248728c

Please sign in to comment.