distinguish nat ip for central subnet with ecmp and active-standby (#3100)

hongzhen-ma · web-flow · commit 42e0574c2eb8 · 2023-08-03T11:58:54.000+08:00
diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go
@@ -239,7 +239,11 @@ func (c *Controller) getEgressNatIpByNode(nodeName string) (map[string]string, e
 		for _, cidr := range strings.Split(subnet.Spec.CIDRBlock, ",") {
 			for _, gw := range strings.Split(subnet.Spec.GatewayNode, ",") {
 				if strings.Contains(gw, ":") && util.GatewayContains(gw, nodeName) && util.CheckProtocol(cidr) == util.CheckProtocol(strings.Split(gw, ":")[1]) {
-					subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])
+					if subnet.Spec.EnableEcmp {
+						subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])
+					} else if subnet.Status.ActivateGateway == nodeName {
+						subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])
+					}
 					break
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,11 @@ func (c *Controller) getEgressNatIpByNode(nodeName string) (map[string]string, e`
`239`	`239`	`for _, cidr := range strings.Split(subnet.Spec.CIDRBlock, ",") {`
`240`	`240`	`for _, gw := range strings.Split(subnet.Spec.GatewayNode, ",") {`
`241`	`241`	`if strings.Contains(gw, ":") && util.GatewayContains(gw, nodeName) && util.CheckProtocol(cidr) == util.CheckProtocol(strings.Split(gw, ":")[1]) {`
`242`		`- subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])`
	`242`	`+ if subnet.Spec.EnableEcmp {`
	`243`	`+ subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])`
	`244`	`+ } else if subnet.Status.ActivateGateway == nodeName {`
	`245`	`+ subnetsNatIp[cidr] = strings.TrimSpace(strings.Split(gw, ":")[1])`
	`246`	`+ }`
`243`	`247`	`break`
`244`	`248`	`}`
`245`	`249`	`}`