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

Set instanceID to azure resource ID format while useInstanceMetadata is enabled

Browse Source
This commit is contained in:
Pengfei Ni 2018-02-08 15:12:36 +08:00
parent b3ec8295be
commit 20de29ae6f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/azure/azure_instances.go
View File

@ -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
}
}