Add controller to antrea-agent for implementing Egress

antrea-io · Apr 2, 2021 · 989c51d · 989c51d
1 parent 27747ee
commit 989c51d
Show file tree

Hide file tree

Showing 13 changed files with 987 additions and 26 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -1634,7 +1634,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-controller
         env:
@@ -1694,6 +1694,7 @@ spec:
           name: host-var-log-antrea
       hostNetwork: true
       nodeSelector:
+        kubernetes.io/hostname: k8s01
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
       serviceAccountName: antrea-controller
@@ -1819,7 +1820,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-agent
         env:

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -1634,7 +1634,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-controller
         env:
@@ -1694,6 +1694,7 @@ spec:
           name: host-var-log-antrea
       hostNetwork: true
       nodeSelector:
+        kubernetes.io/hostname: k8s01
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
       serviceAccountName: antrea-controller
@@ -1819,7 +1820,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-agent
         env:

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -1634,7 +1634,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-controller
         env:
@@ -1694,6 +1694,7 @@ spec:
           name: host-var-log-antrea
       hostNetwork: true
       nodeSelector:
+        kubernetes.io/hostname: k8s01
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
       serviceAccountName: antrea-controller
@@ -1819,7 +1820,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-agent
         env:

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -1648,7 +1648,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-controller
         env:
@@ -1708,6 +1708,7 @@ spec:
           name: host-var-log-antrea
       hostNetwork: true
       nodeSelector:
+        kubernetes.io/hostname: k8s01
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
       serviceAccountName: antrea-controller
@@ -1863,7 +1864,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-agent
         env:

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -1401,7 +1401,7 @@ data:
     #  NetworkPolicyStats: false
 
     # Enable controlling SNAT IPs of Pod egress traffic.
-    #  Egress: false
+      Egress: true
 
     # Name of the OpenVSwitch bridge antrea-agent will create and use.
     # Make sure it doesn't conflict with your existing OpenVSwitch bridges.
@@ -1557,7 +1557,7 @@ data:
     #  NetworkPolicyStats: false
 
     # Enable controlling SNAT IPs of Pod egress traffic.
-    #  Egress: false
+      Egress: true
 
     # The port for the antrea-controller APIServer to serve on.
     # Note that if it's set to another value, the `containerPort` of the `api` port of the
@@ -1639,7 +1639,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-controller
         env:
@@ -1699,6 +1699,7 @@ spec:
           name: host-var-log-antrea
       hostNetwork: true
       nodeSelector:
+        kubernetes.io/hostname: k8s01
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
       serviceAccountName: antrea-controller
@@ -1824,7 +1825,7 @@ spec:
         - --alsologtostderr
         - --log_file_max_size=100
         - --log_file_max_num=4
-        - --v=0
+        - --v=5
         command:
         - antrea-agent
         env:

diff --git a/build/yamls/base/agent.yml b/build/yamls/base/agent.yml
@@ -68,7 +68,7 @@ spec:
               cpu: "200m"
           command: ["antrea-agent"]
           # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).
-          args: ["--config", "/etc/antrea/antrea-agent.conf", "--logtostderr=false", "--log_dir=/var/log/antrea", "--alsologtostderr", "--log_file_max_size=100", "--log_file_max_num=4", "--v=0"]
+          args: ["--config", "/etc/antrea/antrea-agent.conf", "--logtostderr=false", "--log_dir=/var/log/antrea", "--alsologtostderr", "--log_file_max_size=100", "--log_file_max_num=4", "--v=5"]
           env:
             # Provide pod and node information for clusterinformation CRD.
             - name: POD_NAME

diff --git a/build/yamls/base/controller.yml b/build/yamls/base/controller.yml
@@ -199,6 +199,7 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
+        kubernetes.io/hostname: k8s01
       hostNetwork: true
       priorityClassName: system-cluster-critical
       tolerations:
@@ -217,7 +218,7 @@ spec:
               cpu: "200m"
           command: ["antrea-controller"]
           # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).
-          args: ["--config", "/etc/antrea/antrea-controller.conf", "--logtostderr=false", "--log_dir=/var/log/antrea", "--alsologtostderr", "--log_file_max_size=100", "--log_file_max_num=4", "--v=0"]
+          args: ["--config", "/etc/antrea/antrea-controller.conf", "--logtostderr=false", "--log_dir=/var/log/antrea", "--alsologtostderr", "--log_file_max_size=100", "--log_file_max_num=4", "--v=5"]
           env:
             # Provide pod and node information for clusterinformation CRD.
             - name: POD_NAME

diff --git a/cmd/antrea-agent/agent.go b/cmd/antrea-agent/agent.go
@@ -27,6 +27,7 @@ import (
 	"github.com/vmware-tanzu/antrea/pkg/agent/cniserver"
 	_ "github.com/vmware-tanzu/antrea/pkg/agent/cniserver/ipam"
 	"github.com/vmware-tanzu/antrea/pkg/agent/config"
+	"github.com/vmware-tanzu/antrea/pkg/agent/controller/egress"
 	"github.com/vmware-tanzu/antrea/pkg/agent/controller/networkpolicy"
 	"github.com/vmware-tanzu/antrea/pkg/agent/controller/noderoute"
 	"github.com/vmware-tanzu/antrea/pkg/agent/controller/traceflow"
@@ -70,6 +71,7 @@ func run(o *Options) error {
 	informerFactory := informers.NewSharedInformerFactory(k8sClient, informerDefaultResync)
 	crdInformerFactory := crdinformers.NewSharedInformerFactory(crdClient, informerDefaultResync)
 	traceflowInformer := crdInformerFactory.Ops().V1alpha1().Traceflows()
+	egressInformer := crdInformerFactory.Egress().V1alpha1().Egresses()
 
 	// Create Antrea Clientset for the given config.
 	antreaClientProvider := agent.NewAntreaClientProvider(o.config.AntreaClientConnection, k8sClient)
@@ -94,7 +96,7 @@ func run(o *Options) error {
 	ofClient := openflow.NewClient(o.config.OVSBridge, ovsBridgeMgmtAddr, ovsDatapathType,
 		features.DefaultFeatureGate.Enabled(features.AntreaProxy),
 		features.DefaultFeatureGate.Enabled(features.AntreaPolicy),
-		false)
+		features.DefaultFeatureGate.Enabled(features.Egress))
 
 	_, serviceCIDRNet, _ := net.ParseCIDR(o.config.ServiceCIDR)
 	var serviceCIDRNetv6 *net.IPNet
@@ -186,6 +188,8 @@ func run(o *Options) error {
 		statsCollector = stats.NewCollector(antreaClientProvider, ofClient, networkPolicyController)
 	}
 
+	egressController := egress.NewEgressController(ofClient, egressInformer, antreaClientProvider, ifaceStore, routeClient, nodeConfig.Name)
+
 	var proxier proxy.Proxier
 	if features.DefaultFeatureGate.Enabled(features.AntreaProxy) {
 		v4Enabled := config.IsIPv4Enabled(nodeConfig, networkConfig.TrafficEncapMode)
@@ -277,6 +281,8 @@ func run(o *Options) error {
 
 	go networkPolicyController.Run(stopCh)
 
+	go egressController.Run(stopCh)
+
 	if features.DefaultFeatureGate.Enabled(features.NetworkPolicyStats) {
 		go statsCollector.Run(stopCh)
 	}