upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-03 22:02:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #51590 from karataliu/instancetypebyid

Browse source 
Automatic merge from submit-queue

Fix InstanceTypeByProviderID for Azure

**What this PR does / why we need it**:

Fix change in #46940, should return InstanceType in function InstanceTypeByProviderID

Otherwise:
```
I0830 05:01:08.497989   15347 node_controller.go:328] Adding node label from cloud provider: beta.kubernetes.io/instance-type=/subscriptions/{id}/resourceGroups/{id}/providers/Microsoft.Compute/virtualMachines/k8s-agentpool1
```

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
```
NONE
```

@brendandburns @realfake
This commit is contained in:
Kubernetes Submit Queue 2017-09-02 11:01:35 -07:00 committed by GitHub
commit 562d7ee37b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure_instances.go
View file

@ -145,7 +145,7 @@ func (az *Cloud) InstanceTypeByProviderID(providerID string) (string, error) {
return "", err
}
return az.InstanceID(name)
return az.InstanceType(name)
}
// InstanceType returns the type of the specified instance.