From b1d1b4f81118debfcfaf836d7620ca710e245a49 Mon Sep 17 00:00:00 2001 From: Jesse Haka Date: Thu, 1 Mar 2018 00:16:47 +0200 Subject: [PATCH] remove filtering by instance state --- pkg/cloudprovider/providers/openstack/openstack.go | 9 +++------ .../providers/openstack/openstack_instances.go | 6 +++--- .../providers/openstack/openstack_loadbalancer.go | 2 +- .../providers/openstack/openstack_routes.go | 2 +- .../providers/openstack/openstack_volumes.go | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 56eb351b8bb..a918662e867 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -415,13 +415,10 @@ func foreachServer(client *gophercloud.ServiceClient, opts servers.ListOptsBuild return err } -func getServerByName(client *gophercloud.ServiceClient, name types.NodeName, showOnlyActive bool) (*servers.Server, error) { +func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*servers.Server, error) { opts := servers.ListOpts{ Name: fmt.Sprintf("^%s$", regexp.QuoteMeta(mapNodeNameToServerName(name))), } - if showOnlyActive { - opts.Status = "ACTIVE" - } pager := servers.List(client, opts) @@ -504,7 +501,7 @@ func nodeAddresses(srv *servers.Server) ([]v1.NodeAddress, error) { } func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName) ([]v1.NodeAddress, error) { - srv, err := getServerByName(client, name, true) + srv, err := getServerByName(client, name) if err != nil { return nil, err } @@ -666,7 +663,7 @@ func (os *OpenStack) GetZoneByNodeName(ctx context.Context, nodeName types.NodeN return cloudprovider.Zone{}, err } - srv, err := getServerByName(compute, nodeName, true) + srv, err := getServerByName(compute, nodeName) if err != nil { if err == ErrNotFound { return cloudprovider.Zone{}, cloudprovider.InstanceNotFound diff --git a/pkg/cloudprovider/providers/openstack/openstack_instances.go b/pkg/cloudprovider/providers/openstack/openstack_instances.go index b8ea557e674..95c20413d34 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_instances.go +++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go @@ -107,7 +107,7 @@ func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID st // ExternalID returns the cloud provider ID of the specified instance (deprecated). func (i *Instances) ExternalID(ctx context.Context, name types.NodeName) (string, error) { - srv, err := getServerByName(i.compute, name, true) + srv, err := getServerByName(i.compute, name) if err != nil { if err == ErrNotFound { return "", cloudprovider.InstanceNotFound @@ -155,7 +155,7 @@ func (os *OpenStack) InstanceID() (string, error) { // InstanceID returns the cloud provider ID of the specified instance. func (i *Instances) InstanceID(ctx context.Context, name types.NodeName) (string, error) { - srv, err := getServerByName(i.compute, name, true) + srv, err := getServerByName(i.compute, name) if err != nil { if err == ErrNotFound { return "", cloudprovider.InstanceNotFound @@ -188,7 +188,7 @@ func (i *Instances) InstanceTypeByProviderID(ctx context.Context, providerID str // InstanceType returns the type of the specified instance. func (i *Instances) InstanceType(ctx context.Context, name types.NodeName) (string, error) { - srv, err := getServerByName(i.compute, name, true) + srv, err := getServerByName(i.compute, name) if err != nil { return "", err diff --git a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go index 1d894db22d7..4ba67be32c2 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go +++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go @@ -552,7 +552,7 @@ func getNodeSecurityGroupIDForLB(compute *gophercloud.ServiceClient, nodes []*v1 for _, node := range nodes { nodeName := types.NodeName(node.Name) - srv, err := getServerByName(compute, nodeName, true) + srv, err := getServerByName(compute, nodeName) if err != nil { return nodeSecurityGroupIDs.List(), err } diff --git a/pkg/cloudprovider/providers/openstack/openstack_routes.go b/pkg/cloudprovider/providers/openstack/openstack_routes.go index 4b0b8047a7d..8af30d9202b 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_routes.go +++ b/pkg/cloudprovider/providers/openstack/openstack_routes.go @@ -297,7 +297,7 @@ func (r *Routes) DeleteRoute(ctx context.Context, clusterName string, route *clo } func getPortIDByIP(compute *gophercloud.ServiceClient, targetNode types.NodeName, ipAddress string) (string, error) { - srv, err := getServerByName(compute, targetNode, true) + srv, err := getServerByName(compute, targetNode) if err != nil { return "", err } diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go index 8b7277afe1e..289c32e6043 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_volumes.go +++ b/pkg/cloudprovider/providers/openstack/openstack_volumes.go @@ -622,7 +622,7 @@ func (os *OpenStack) DiskIsAttachedByName(nodeName types.NodeName, volumeID stri if err != nil { return false, "", err } - srv, err := getServerByName(cClient, nodeName, false) + srv, err := getServerByName(cClient, nodeName) if err != nil { if err == ErrNotFound { // instance not found anymore in cloudprovider, assume that cinder is detached @@ -659,7 +659,7 @@ func (os *OpenStack) DisksAreAttachedByName(nodeName types.NodeName, volumeIDs [ if err != nil { return attached, err } - srv, err := getServerByName(cClient, nodeName, false) + srv, err := getServerByName(cClient, nodeName) if err != nil { if err == ErrNotFound { // instance not found anymore, mark all volumes as detached