Skip to content

K
k3s
Commit 2eebe956 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40996 from NickrenREN/openstack-servername

Automatic merge from submit-queue (batch tested with PRs 40385, 40786, 40999, 41026, 40996) optimize duplicate openstack serverList judgement if len(serverList) > 1, we will return err in pager.EachPage() function,so here we do not need to judge again
parents 751cbc9b 70ab5fc6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
pkg/cloudprovider/providers/openstack/openstack.go
View file @ 2eebe956
...@@ -295,8 +295,6 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*s ...@@ -295,8 +295,6 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*s
if len(serverList) == 0 { if len(serverList) == 0 {
return nil, ErrNotFound return nil, ErrNotFound
} else if len(serverList) > 1 {
return nil, ErrMultipleResults
} }
return &serverList[0], nil return &serverList[0], nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment