Merge pull request #4624 from tssurya/udn-remove-GR-conntrack-zone

Don't use zone 0 for UDN Networks

go-controller/pkg/ovn/gateway.go

@@ -208,9 +208,13 @@ func (gw *GatewayManager) GatewayInit(
 		"dynamic_neigh_routers":         "true",
 		"chassis":                       l3GatewayConfig.ChassisID,
 		"lb_force_snat_ip":              "router_ip",
-		"snat-ct-zone":                  "0",
 		"mac_binding_age_threshold":     types.GRMACBindingAgeThreshold,
 	}
+	// set the snat-ct-zone only for the default network
+	// for UDN's OVN will pick a random one
+	if gw.netInfo.GetNetworkName() == types.DefaultNetworkName {
+		logicalRouterOptions["snat-ct-zone"] = "0"
+	}
 	logicalRouterExternalIDs := map[string]string{
 		"physical_ip":  physicalIPs[0],
 		"physical_ips": strings.Join(physicalIPs, ","),

go-controller/pkg/ovn/secondary_layer3_network_controller_test.go

@@ -453,12 +453,8 @@ func expectedGWEntities(nodeName string, netInfo util.NetInfo, gwConfig util.L3G
 		expectedGatewayChassis(nodeName, netInfo, gwConfig),
 		expectedStaticMACBinding(gwRouterName, nextHopMasqueradeIP()),
 	)
-	for _, entity := range expectedExternalSwitchAndLSPs(netInfo, gwConfig, nodeName) {
-		expectedEntities = append(expectedEntities, entity)
-	}
-	for _, entity := range expectedJoinSwitchAndLSPs(netInfo, nodeName) {
-		expectedEntities = append(expectedEntities, entity)
-	}
+	expectedEntities = append(expectedEntities, expectedExternalSwitchAndLSPs(netInfo, gwConfig, nodeName)...)
+	expectedEntities = append(expectedEntities, expectedJoinSwitchAndLSPs(netInfo, nodeName)...)
 	return expectedEntities
 }
 
@@ -757,7 +753,6 @@ func networkSubnet(netInfo util.NetInfo) string {
 func gwRouterOptions(gwConfig util.L3GatewayConfig) map[string]string {
 	return map[string]string{
 		"lb_force_snat_ip":              "router_ip",
-		"snat-ct-zone":                  "0",
 		"mac_binding_age_threshold":     "300",
 		"chassis":                       gwConfig.ChassisID,
 		"always_learn_from_arp_request": "false",