Add egress status of api and Update codegen of egress status

antrea-io · Jun 3, 2021 · 0bbc99f · 0bbc99f
1 parent 913963c
commit 0bbc99f
Show file tree

Hide file tree

Showing 16 changed files with 231 additions and 59 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:
@@ -1414,11 +1418,18 @@ spec:
             - 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
@@ -3199,10 +3210,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:
@@ -1414,11 +1418,18 @@ spec:
             - 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
@@ -3199,10 +3210,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:
@@ -1414,11 +1418,18 @@ spec:
             - 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
@@ -3199,10 +3210,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:
@@ -1414,11 +1418,18 @@ spec:
             - 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
@@ -3199,10 +3210,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:
@@ -1414,11 +1418,18 @@ spec:
             - 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
@@ -3199,10 +3210,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
@@ -80,6 +80,11 @@ spec:
                  enum:
                    - Auto
                    - None
+          status:
+            type: object
+            properties:
+              nodeName:
+                type: string
     additionalPrinterColumns:
     - description: Specifies the SNAT IP address for the selected workloads.
       jsonPath: .spec.egressIP
@@ -88,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
@@ -225,12 +225,17 @@ func run(o *Options) error {
 
 	var egressController *egress.EgressController
 	if features.DefaultFeatureGate.Enabled(features.Egress) {
-		gossipCluster, err := memberlist.NewGossipCluster(o.config.GossipClusterPort, 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 gossipCluster *memberlist.GossipCluster
+		if nodeAutoFailoverSupport {
+			gossipCluster, err = memberlist.NewGossipCluster(o.config.GossipClusterPort, 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, gossipCluster)
+			routeClient, nodeConfig.Name, gossipCluster, crdClient, nodeAutoFailoverSupport)
 	}
 
 	isChaining := false