Add select egress's owner node and assign egress-ip to node for egres…

…s failover feature, Add egress status of api and Update codegen of egress status Signed-off-by: wenqiq <wenqiq@vmware.com>
antrea-io · Jun 4, 2021 · 2135405 · 2135405
1 parent 7e01f29
commit 2135405
Show file tree

Hide file tree

Showing 19 changed files with 493 additions and 14 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -1345,6 +1345,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -1405,15 +1409,27 @@ spec:
                 - format: ipv4
                 - format: ipv6
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             - egressIP
             type: object
+          status:
+            properties:
+              nodeName:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3195,10 +3211,13 @@ rules:
   - crd.antrea.io
   resources:
   - egresses
+  - egresses/status
   verbs:
   - get
   - watch
   - list
+  - update
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -1345,6 +1345,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -1405,15 +1409,27 @@ spec:
                 - format: ipv4
                 - format: ipv6
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             - egressIP
             type: object
+          status:
+            properties:
+              nodeName:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3195,10 +3211,13 @@ rules:
   - crd.antrea.io
   resources:
   - egresses
+  - egresses/status
   verbs:
   - get
   - watch
   - list
+  - update
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -1345,6 +1345,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -1405,15 +1409,27 @@ spec:
                 - format: ipv4
                 - format: ipv6
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             - egressIP
             type: object
+          status:
+            properties:
+              nodeName:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3195,10 +3211,13 @@ rules:
   - crd.antrea.io
   resources:
   - egresses
+  - egresses/status
   verbs:
   - get
   - watch
   - list
+  - update
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -1345,6 +1345,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -1405,15 +1409,27 @@ spec:
                 - format: ipv4
                 - format: ipv6
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             - egressIP
             type: object
+          status:
+            properties:
+              nodeName:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3195,10 +3211,13 @@ rules:
   - crd.antrea.io
   resources:
   - egresses
+  - egresses/status
   verbs:
   - get
   - watch
   - list
+  - update
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -1345,6 +1345,10 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -1405,15 +1409,27 @@ spec:
                 - format: ipv4
                 - format: ipv6
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             - egressIP
             type: object
+          status:
+            properties:
+              nodeName:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3195,10 +3211,13 @@ rules:
   - crd.antrea.io
   resources:
   - egresses
+  - egresses/status
   verbs:
   - get
   - watch
   - list
+  - update
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/build/yamls/base/agent-rbac.yml b/build/yamls/base/agent-rbac.yml
@@ -146,10 +146,13 @@ rules:
       - crd.antrea.io
     resources:
       - egresses
+      - egresses/status
     verbs:
       - get
       - watch
       - list
+      - update
+      - patch
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/build/yamls/base/crds.yml b/build/yamls/base/crds.yml
@@ -75,6 +75,16 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              failoverPolicy:
+                 type: string
+                 enum:
+                   - Auto
+                   - None
+          status:
+            type: object
+            properties:
+              nodeName:
+                type: string
     additionalPrinterColumns:
     - description: Specifies the SNAT IP address for the selected workloads.
       jsonPath: .spec.egressIP
@@ -83,6 +93,12 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: The Owner Node of egress IP
+      jsonPath: .status.nodeName
+      name: Status
+      type: string
+    subresources:
+      status: {}
   scope: Cluster
   names:
     plural: egresses

diff --git a/cmd/antrea-agent/agent.go b/cmd/antrea-agent/agent.go
@@ -224,13 +224,19 @@ func run(o *Options) error {
 	}
 
 	var egressController *egress.EgressController
-	var cluster *memberlist.Cluster
 	if features.DefaultFeatureGate.Enabled(features.Egress) {
-		egressController = egress.NewEgressController(ofClient, egressInformer, antreaClientProvider, ifaceStore, routeClient, nodeConfig.Name)
-		cluster, err = memberlist.NewCluster(o.config.ClusterPort, nodeInformer, nodeConfig)
-		if err != nil {
-			return fmt.Errorf("initializing egress node memberlist cluster error: %v", err)
+		// turn on the egress auto failover switch, to-do
+		nodeAutoFailoverSupport := true
+		var cluster *memberlist.Cluster
+		if nodeAutoFailoverSupport {
+			cluster, err = memberlist.NewCluster(o.config.ClusterPort, nodeInformer, nodeConfig)
+			if err != nil {
+				return fmt.Errorf("initializing egress node memberlist cluster error: %v", err)
+			}
 		}
+		egressController = egress.NewEgressController(
+			ofClient, egressInformer, antreaClientProvider, ifaceStore, routeClient,
+			nodeConfig.Name, cluster, crdClient, nodeAutoFailoverSupport)
 	}
 	isChaining := false
 	if networkConfig.TrafficEncapMode.IsNetworkPolicyOnly() {
@@ -305,7 +311,6 @@ func run(o *Options) error {
 
 	if features.DefaultFeatureGate.Enabled(features.Egress) {
 		go egressController.Run(stopCh)
-		go cluster.Run(stopCh)
 	}
 
 	if features.DefaultFeatureGate.Enabled(features.NetworkPolicyStats) {