Merge pull request #59604 from feiskyer/automated-cherry-pick-of-#595…

…39-upstream-release-1.8 Automatic merge from submit-queue. Automated cherry pick of #59539: Set instanceID to azure resource ID format while Cherry pick of #59539 on release-1.8. #59539: Set instanceID to azure resource ID format while
kubernetes · Feb 10, 2018 · 849d464 · 849d464
2 parents b4ea44a + 41dc2f9
commit 849d464
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/cloudprovider/providers/azure/azure_instances.go b/pkg/cloudprovider/providers/azure/azure_instances.go
@@ -108,10 +108,8 @@ func (az *Cloud) InstanceID(name types.NodeName) (string, error) {
 			return "", err
 		}
 		if isLocalInstance {
-			externalInstanceID, err := az.metadata.Text("instance/compute/vmId")
-			if err == nil {
-				return externalInstanceID, nil
-			}
+			nodeName := mapNodeNameToVMName(name)
+			return az.getMachineID(nodeName), nil
 		}
 	}
 	var machine compute.VirtualMachine