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
643afd3f
Commit
643afd3f
authored
Jun 30, 2017
by
FengyunPan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deleting empty monitors
Fix #48094 When create-monitor of cloud-config is false, pool has not monitor and can not delete empty monitor.
parent
e74ef816
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
openstack_loadbalancer.go
...oudprovider/providers/openstack/openstack_loadbalancer.go
+7
-0
No files found.
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @
643afd3f
...
@@ -763,10 +763,14 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
...
@@ -763,10 +763,14 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
}
}
waitLoadbalancerActiveProvisioningStatus
(
lbaas
.
network
,
loadbalancer
.
ID
)
waitLoadbalancerActiveProvisioningStatus
(
lbaas
.
network
,
loadbalancer
.
ID
)
monitorID
=
monitor
.
ID
monitorID
=
monitor
.
ID
}
else
if
lbaas
.
opts
.
CreateMonitor
==
false
{
glog
.
V
(
4
)
.
Infof
(
"Do not create monitor for pool %s when create-monitor is false"
,
pool
.
ID
)
}
}
if
monitorID
!=
""
{
glog
.
V
(
4
)
.
Infof
(
"Monitor for pool %s: %s"
,
pool
.
ID
,
monitorID
)
glog
.
V
(
4
)
.
Infof
(
"Monitor for pool %s: %s"
,
pool
.
ID
,
monitorID
)
}
}
}
// All remaining listeners are obsolete, delete
// All remaining listeners are obsolete, delete
for
_
,
listener
:=
range
oldListeners
{
for
_
,
listener
:=
range
oldListeners
{
...
@@ -1106,8 +1110,11 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
...
@@ -1106,8 +1110,11 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
return
fmt
.
Errorf
(
"Error getting pool for listener %s: %v"
,
listener
.
ID
,
err
)
return
fmt
.
Errorf
(
"Error getting pool for listener %s: %v"
,
listener
.
ID
,
err
)
}
}
poolIDs
=
append
(
poolIDs
,
pool
.
ID
)
poolIDs
=
append
(
poolIDs
,
pool
.
ID
)
// If create-monitor of cloud-config is false, pool has not monitor.
if
pool
.
MonitorID
!=
""
{
monitorIDs
=
append
(
monitorIDs
,
pool
.
MonitorID
)
monitorIDs
=
append
(
monitorIDs
,
pool
.
MonitorID
)
}
}
}
// get all members associated with each poolIDs
// get all members associated with each poolIDs
var
memberIDs
[]
string
var
memberIDs
[]
string
...
...
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