Merge pull request #3452 from nilo19/bug/cherry-pick-3418-1-18
Cherry pick the bug fix in #2418 onto 1.18
This commit is contained in:
commit
45b905c78e
|
|
@ -144,11 +144,12 @@ func (util *AzUtil) DeleteVirtualMachine(rg string, name string) error {
|
||||||
|
|
||||||
osDiskName := vm.VirtualMachineProperties.StorageProfile.OsDisk.Name
|
osDiskName := vm.VirtualMachineProperties.StorageProfile.OsDisk.Name
|
||||||
var nicName string
|
var nicName string
|
||||||
|
var err error
|
||||||
nicID := (*vm.VirtualMachineProperties.NetworkProfile.NetworkInterfaces)[0].ID
|
nicID := (*vm.VirtualMachineProperties.NetworkProfile.NetworkInterfaces)[0].ID
|
||||||
if nicID == nil {
|
if nicID == nil {
|
||||||
klog.Warningf("NIC ID is not set for VM (%s/%s)", rg, name)
|
klog.Warningf("NIC ID is not set for VM (%s/%s)", rg, name)
|
||||||
} else {
|
} else {
|
||||||
nicName, err := resourceName(*nicID)
|
nicName, err = resourceName(*nicID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue