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
744ff16c
Commit
744ff16c
authored
Mar 09, 2018
by
n-marton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for openstack member cleanup for multiple port cases
parent
7c9293e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
15 deletions
+8
-15
openstack_loadbalancer.go
...oudprovider/providers/openstack/openstack_loadbalancer.go
+8
-15
No files found.
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @
744ff16c
...
@@ -1424,18 +1424,6 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
...
@@ -1424,18 +1424,6 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
}
}
}
}
// get all members associated with each poolIDs
var
memberIDs
[]
string
for
_
,
pool
:=
range
poolIDs
{
membersList
,
err
:=
getMembersByPoolID
(
lbaas
.
lb
,
pool
)
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
return
fmt
.
Errorf
(
"error getting pool members %s: %v"
,
pool
,
err
)
}
for
_
,
member
:=
range
membersList
{
memberIDs
=
append
(
memberIDs
,
member
.
ID
)
}
}
// delete all monitors
// delete all monitors
for
_
,
monitorID
:=
range
monitorIDs
{
for
_
,
monitorID
:=
range
monitorIDs
{
err
:=
v2monitors
.
Delete
(
lbaas
.
lb
,
monitorID
)
.
ExtractErr
()
err
:=
v2monitors
.
Delete
(
lbaas
.
lb
,
monitorID
)
.
ExtractErr
()
...
@@ -1450,9 +1438,14 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
...
@@ -1450,9 +1438,14 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
// delete all members and pools
// delete all members and pools
for
_
,
poolID
:=
range
poolIDs
{
for
_
,
poolID
:=
range
poolIDs
{
// get members for current pool
membersList
,
err
:=
getMembersByPoolID
(
lbaas
.
lb
,
poolID
)
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
return
fmt
.
Errorf
(
"error getting pool members %s: %v"
,
poolID
,
err
)
}
// delete all members for this pool
// delete all members for this pool
for
_
,
member
ID
:=
range
memberIDs
{
for
_
,
member
:=
range
membersList
{
err
:=
v2pools
.
DeleteMember
(
lbaas
.
lb
,
poolID
,
memberID
)
.
ExtractErr
()
err
:=
v2pools
.
DeleteMember
(
lbaas
.
lb
,
poolID
,
member
.
ID
)
.
ExtractErr
()
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
return
err
return
err
}
}
...
@@ -1463,7 +1456,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
...
@@ -1463,7 +1456,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
}
}
// delete pool
// delete pool
err
:
=
v2pools
.
Delete
(
lbaas
.
lb
,
poolID
)
.
ExtractErr
()
err
=
v2pools
.
Delete
(
lbaas
.
lb
,
poolID
)
.
ExtractErr
()
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
if
err
!=
nil
&&
!
isNotFound
(
err
)
{
return
err
return
err
}
}
...
...
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