Skip to content

K
k3s
Unverified Commit 145f0aa5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63091 from gonzolino/lb-member-name

Automatic merge from submit-queue (batch tested with PRs 63138, 63091, 63201, 63341). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Set names for OpenStack loadbalancer members and monitors **What this PR does / why we need it**: This PR sets names for OpenStack loadbalancer members and monitors. ATM names for members and monitors are empty, making it difficult to identify where they belong. Healthmonitors will be named `monitor_<lb_name>_<index>` and members will be named `member_<lb_name>_<index>_<node_name>`. This naming scheme should in sync with the naming of other LB resources, e.g. pools: `pool_<lb_name>_<index>`. **Release note**: ```release-note NONE ```
parents bd5ea573 e2ebc5f1
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @ 145f0aa5
...@@ -817,6 +817,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string ...@@ -817,6 +817,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
if !memberExists(members, addr, int(port.NodePort)) { if !memberExists(members, addr, int(port.NodePort)) {
glog.V(4).Infof("Creating member for pool %s", pool.ID) glog.V(4).Infof("Creating member for pool %s", pool.ID)
_, err := v2pools.CreateMember(lbaas.lb, pool.ID, v2pools.CreateMemberOpts{ _, err := v2pools.CreateMember(lbaas.lb, pool.ID, v2pools.CreateMemberOpts{
Name: fmt.Sprintf("member_%s_%d_%s", name, portIndex, node.Name),
ProtocolPort: int(port.NodePort), ProtocolPort: int(port.NodePort),
Address: addr, Address: addr,
SubnetID: lbaas.opts.SubnetID, SubnetID: lbaas.opts.SubnetID,
...@@ -854,6 +855,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string ...@@ -854,6 +855,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
if monitorID == "" && lbaas.opts.CreateMonitor { if monitorID == "" && lbaas.opts.CreateMonitor {
glog.V(4).Infof("Creating monitor for pool %s", pool.ID) glog.V(4).Infof("Creating monitor for pool %s", pool.ID)
monitor, err := v2monitors.Create(lbaas.lb, v2monitors.CreateOpts{ monitor, err := v2monitors.Create(lbaas.lb, v2monitors.CreateOpts{
Name: fmt.Sprintf("monitor_%s_%d", name, portIndex),
PoolID: pool.ID, PoolID: pool.ID,
Type: string(port.Protocol), Type: string(port.Protocol),
Delay: int(lbaas.opts.MonitorDelay.Duration.Seconds()), Delay: int(lbaas.opts.MonitorDelay.Duration.Seconds()),
...@@ -1214,17 +1216,17 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string ...@@ -1214,17 +1216,17 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string
} }
// Compose Set of member (addresses) that _should_ exist // Compose Set of member (addresses) that _should_ exist
addrs := map[string]empty{} addrs := make(map[string]*v1.Node)
for _, node := range nodes { for _, node := range nodes {
addr, err := nodeAddressForLB(node) addr, err := nodeAddressForLB(node)
if err != nil { if err != nil {
return err return err
} }
addrs[addr] = empty{} addrs[addr] = node
} }
// Check for adding/removing members associated with each port // Check for adding/removing members associated with each port
for _, port := range ports { for portIndex, port := range ports {
// Get listener associated with this port // Get listener associated with this port
listener, ok := lbListeners[portKey{ listener, ok := lbListeners[portKey{
Protocol: toListenersProtocol(port.Protocol), Protocol: toListenersProtocol(port.Protocol),
...@@ -1251,12 +1253,13 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string ...@@ -1251,12 +1253,13 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string
} }
// Add any new members for this port // Add any new members for this port
for addr := range addrs { for addr, node := range addrs {
if _, ok := members[addr]; ok && members[addr].ProtocolPort == int(port.NodePort) { if _, ok := members[addr]; ok && members[addr].ProtocolPort == int(port.NodePort) {
// Already exists, do not create member // Already exists, do not create member
continue continue
} }
_, err := v2pools.CreateMember(lbaas.lb, pool.ID, v2pools.CreateMemberOpts{ _, err := v2pools.CreateMember(lbaas.lb, pool.ID, v2pools.CreateMemberOpts{
Name: fmt.Sprintf("member_%s_%d_%s", loadbalancer.Name, portIndex, node.Name),
Address: addr, Address: addr,
ProtocolPort: int(port.NodePort), ProtocolPort: int(port.NodePort),
SubnetID: lbaas.opts.SubnetID, SubnetID: lbaas.opts.SubnetID,
......
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