Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b1d1b4f8
Commit
b1d1b4f8
authored
Mar 01, 2018
by
Jesse Haka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove filtering by instance state
parent
e267f46c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
13 deletions
+10
-13
openstack.go
pkg/cloudprovider/providers/openstack/openstack.go
+3
-6
openstack_instances.go
pkg/cloudprovider/providers/openstack/openstack_instances.go
+3
-3
openstack_loadbalancer.go
...oudprovider/providers/openstack/openstack_loadbalancer.go
+1
-1
openstack_routes.go
pkg/cloudprovider/providers/openstack/openstack_routes.go
+1
-1
openstack_volumes.go
pkg/cloudprovider/providers/openstack/openstack_volumes.go
+2
-2
No files found.
pkg/cloudprovider/providers/openstack/openstack.go
View file @
b1d1b4f8
...
...
@@ -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
...
...
pkg/cloudprovider/providers/openstack/openstack_instances.go
View file @
b1d1b4f8
...
...
@@ -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
...
...
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @
b1d1b4f8
...
...
@@ -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
}
...
...
pkg/cloudprovider/providers/openstack/openstack_routes.go
View file @
b1d1b4f8
...
...
@@ -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
}
...
...
pkg/cloudprovider/providers/openstack/openstack_volumes.go
View file @
b1d1b4f8
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment