From 20de29ae6fe0200365dc003e4f06bdab965f6fed Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Thu, 8 Feb 2018 15:12:36 +0800 Subject: [PATCH] Set instanceID to azure resource ID format while useInstanceMetadata is enabled --- pkg/cloudprovider/providers/azure/azure_instances.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_instances.go b/pkg/cloudprovider/providers/azure/azure_instances.go index 7e25f2f79b6..1b85334e1aa 100644 --- a/pkg/cloudprovider/providers/azure/azure_instances.go +++ b/pkg/cloudprovider/providers/azure/azure_instances.go @@ -112,10 +112,8 @@ func (az *Cloud) InstanceID(ctx context.Context, name types.NodeName) (string, e 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 } }