netpol: Add dual-stack support

This change allows to define two cluster CIDRs for compatibility with Kubernetes dual-stack, with an assumption that two CIDRs are usually IPv4 and IPv6. Signed-off-by: Michal Rostecki <[email protected]>
cloudnativelabs · Apr 12, 2022 · 24b7390 · 24b7390
1 parent b502802
commit 24b7390
Show file tree

Hide file tree

Showing 14 changed files with 1,247 additions and 536 deletions.
diff --git a/docs/user-guide.md b/docs/user-guide.md
@@ -56,6 +56,8 @@ Usage of kube-router:
       --disable-source-dest-check                     Disable the source-dest-check attribute for AWS EC2 instances. When this option is false, it must be set some other way. (default true)
       --enable-cni                                    Enable CNI plugin. Disable if you want to use kube-router features alongside another CNI plugin. (default true)
       --enable-ibgp                                   Enables peering with nodes with the same ASN, if disabled will only peer with external BGP peers (default true)
+      --enable-ipv4                                   Enables IPv4 support (default true)
+      --enable-ipv6                                   Enables IPv6 support (default true)
       --enable-overlay                                When enable-overlay is set to true, IP-in-IP tunneling is used for pod-to-pod networking across nodes in different subnets. When set to false no tunneling is used and routing infrastructure is expected to route traffic for pod-to-pod networking across nodes in different subnets (default true)
       --enable-pod-egress                             SNAT traffic from Pods to destinations outside the cluster. (default true)
       --enable-pprof                                  Enables pprof for debugging performance and memory leak issues.

diff --git a/pkg/cmd/kube-router.go b/pkg/cmd/kube-router.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"os/signal"
 	"sync"
@@ -14,9 +15,12 @@ import (
 	"github.com/cloudnativelabs/kube-router/pkg/healthcheck"
 	"github.com/cloudnativelabs/kube-router/pkg/metrics"
 	"github.com/cloudnativelabs/kube-router/pkg/options"
+	"github.com/cloudnativelabs/kube-router/pkg/utils"
 	"github.com/cloudnativelabs/kube-router/pkg/version"
+	"github.com/coreos/go-iptables/iptables"
 	"k8s.io/klog/v2"
 
+	v1core "k8s.io/api/core/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -184,8 +188,39 @@ func (kr *KubeRouter) Run() error {
 	}
 
 	if kr.Config.RunFirewall {
+		iptablesCmdHandlers := make(map[v1core.IPFamily]utils.IPTablesHandler, 2)
+		ipSetHandlers := make(map[v1core.IPFamily]utils.IPSetHandler, 2)
+
+		if kr.Config.EnableIPv4 {
+			iptHandler, err := iptables.NewWithProtocol(iptables.ProtocolIPv4)
+			if err != nil {
+				return fmt.Errorf("failed to create iptables handler: %w", err)
+			}
+			iptablesCmdHandlers[v1core.IPv4Protocol] = iptHandler
+
+			ipset, err := utils.NewIPSet(false)
+			if err != nil {
+				return fmt.Errorf("failed to create ipset handler: %w", err)
+			}
+			ipSetHandlers[v1core.IPv4Protocol] = ipset
+		}
+		if kr.Config.EnableIPv6 {
+			iptHandler, err := iptables.NewWithProtocol(iptables.ProtocolIPv6)
+			if err != nil {
+				return fmt.Errorf("failed to create iptables handler: %w", err)
+			}
+			iptablesCmdHandlers[v1core.IPv6Protocol] = iptHandler
+
+			ipset, err := utils.NewIPSet(true)
+			if err != nil {
+				return fmt.Errorf("failed to create ipset handler: %w", err)
+			}
+			ipSetHandlers[v1core.IPv6Protocol] = ipset
+		}
+
 		npc, err := netpol.NewNetworkPolicyController(kr.Client,
-			kr.Config, podInformer, npInformer, nsInformer, &ipsetMutex)
+			kr.Config, podInformer, npInformer, nsInformer, &ipsetMutex,
+			iptablesCmdHandlers, ipSetHandlers)
 		if err != nil {
 			return errors.New("Failed to create network policy controller: " + err.Error())
 		}