[occm] Support members without subnet in fully populated LB (#2124) (#2126)

danfai · web-flow · commit 2231e3436446 · 2023-03-07T08:58:37.000-08:00
* [occm] Do not send the subnet-id if it is empty for members during the
  creation of fully populated loadbalancer.
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -1222,12 +1222,17 @@ func (lbaas *LbaasV2) buildBatchUpdateMemberOpts(port corev1.ServicePort, nodes
 			}
 		}
 
+		memberSubnetID := &svcConf.lbMemberSubnetID
+		if memberSubnetID != nil && *memberSubnetID == "" {
+			memberSubnetID = nil
+		}
+
 		if port.NodePort != 0 { // It's 0 when AllocateLoadBalancerNodePorts=False
 			member := v2pools.BatchUpdateMemberOpts{
 				Address:      addr,
 				ProtocolPort: int(port.NodePort),
 				Name:         &node.Name,
-				SubnetID:     &svcConf.lbMemberSubnetID,
+				SubnetID:     memberSubnetID,
 			}
 			if svcConf.healthCheckNodePort > 0 && lbaas.canUseHTTPMonitor(port) {
 				member.MonitorPort = &svcConf.healthCheckNodePort

Original file line number	Diff line number	Diff line change
`@@ -1222,12 +1222,17 @@ func (lbaas *LbaasV2) buildBatchUpdateMemberOpts(port corev1.ServicePort, nodes`
`1222`	`1222`	`}`
`1223`	`1223`	`}`
`1224`	`1224`
	`1225`	`+ memberSubnetID := &svcConf.lbMemberSubnetID`
	`1226`	`+ if memberSubnetID != nil && *memberSubnetID == "" {`
	`1227`	`+ memberSubnetID = nil`
	`1228`	`+ }`
	`1229`	`+`
`1225`	`1230`	`if port.NodePort != 0 { // It's 0 when AllocateLoadBalancerNodePorts=False`
`1226`	`1231`	`member := v2pools.BatchUpdateMemberOpts{`
`1227`	`1232`	`Address: addr,`
`1228`	`1233`	`ProtocolPort: int(port.NodePort),`
`1229`	`1234`	`Name: &node.Name,`
`1230`		`- SubnetID: &svcConf.lbMemberSubnetID,`
	`1235`	`+ SubnetID: memberSubnetID,`
`1231`	`1236`	`}`
`1232`	`1237`	`if svcConf.healthCheckNodePort > 0 && lbaas.canUseHTTPMonitor(port) {`
`1233`	`1238`	`member.MonitorPort = &svcConf.healthCheckNodePort`