github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49231 from dims/tolerate-flavor-info-keys

Browse Source 
Automatic merge from submit-queue

Tolerate Flavor information for computing instance type

**What this PR does / why we need it**:
Current devstack seems to return "id", and an upcoming change using
nova's microversion will be returning "original_name":
https://blueprints.launchpad.net/nova/+spec/instance-flavor-api

So let's just inspect what is present and use that to figure out
the instance type.

**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**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-20 00:33:46 -07:00 committed by GitHub
commit acc19cafa4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/cloudprovider/providers/openstack/openstack_instances.go
View File

@ -188,19 +188,17 @@ func (i *Instances) InstanceType(name types.NodeName) (string, error) {
} }
func srvInstanceType(srv *servers.Server) (string, error) { func srvInstanceType(srv *servers.Server) (string, error) {
val, ok := srv.Flavor["name"] keys := []string{"name", "id", "original_name"}
for _, key := range keys {
if !ok { val, found := srv.Flavor[key]
return "", fmt.Errorf("flavor name not present in server info") if found {
flavor, ok := val.(string)
if ok {
return flavor, nil
}
}
} }
return "", fmt.Errorf("flavor name/id not found")
flavor, ok := val.(string)
if !ok {
return "", fmt.Errorf("flavor name is not a string")
}
return flavor, nil
} }
func instanceIDFromProviderID(providerID string) (instanceID string, err error) { func instanceIDFromProviderID(providerID string) (instanceID string, err error) {