fix: ipv6 policy route

kubeovn · Jul 3, 2020 · ca12202 · ca12202
1 parent e083c48
commit ca12202
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -233,6 +233,9 @@ func (c *Controller) handleAddNode(key string) error {
 	}
 
 	match := fmt.Sprintf("ip4.src==$%s && ip4.dst!=$%s", nodeLocalAddressSet, util.SubnetAddressSet)
+	if util.CheckProtocol(ip) == kubeovnv1.ProtocolIPv6 {
+		match = fmt.Sprintf("ip6.src==$%s && ip6.dst!=$%s", nodeLocalAddressSet, util.SubnetAddressSet)
+	}
 	if err := c.ovnClient.CreatePolicyRoute(c.config.ClusterRouter, match, ip, util.DistributedGatewayPolicyRoutePriority); err != nil {
 		klog.Errorf("failed to create policy route for node %s, %v", key, err)
 		return err

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -702,6 +702,9 @@ func (c *Controller) reconcileGateway(subnet *kubeovnv1.Subnet) error {
 	}
 
 	match := fmt.Sprintf("ip4.src==%s && ip4.dst!=$%s", subnet.Spec.CIDRBlock, util.SubnetAddressSet)
+	if subnet.Spec.Protocol == kubeovnv1.ProtocolIPv6 {
+		match = fmt.Sprintf("ip6.src==$%s && ip6.dst!=$%s", subnet.Spec.CIDRBlock, util.SubnetAddressSet)
+	}
 	if err := c.ovnClient.CreatePolicyRoute(c.config.ClusterRouter, match, nodeTunlIPAddr.String(), util.CentralGatewayPolicyRoutePriority); err != nil {
 		klog.Errorf("failed to create policy route for subnet %s, %v", subnet.Name, err)
 		return err