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 15, 2021 · a3de615 · a3de615
1 parent 9090de5
commit a3de615
Show file tree

Hide file tree

Showing 22 changed files with 473 additions and 11 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:
@@ -1412,14 +1416,26 @@ spec:
                 type: string
               externalIPPool:
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             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
@@ -3280,10 +3296,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:
@@ -1412,14 +1416,26 @@ spec:
                 type: string
               externalIPPool:
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             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
@@ -3280,10 +3296,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:
@@ -1412,14 +1416,26 @@ spec:
                 type: string
               externalIPPool:
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             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
@@ -3280,10 +3296,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:
@@ -1412,14 +1416,26 @@ spec:
                 type: string
               externalIPPool:
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             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
@@ -3280,10 +3296,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:
@@ -1412,14 +1416,26 @@ spec:
                 type: string
               externalIPPool:
                 type: string
+              failoverPolicy:
+                enum:
+                - Auto
+                - None
+                type: string
             required:
             - appliedTo
             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
@@ -3280,10 +3296,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
@@ -81,6 +81,16 @@ spec:
                 - format: ipv6
               externalIPPool:
                 type: string
+              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
@@ -89,6 +99,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/go.mod b/go.mod
@@ -3,6 +3,7 @@ module antrea.io/antrea
 go 1.15
 
 require (
+	bou.ke/monkey v1.0.2
 	github.com/Mellanox/sriovnet v1.0.2
 	github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331
 	github.com/Microsoft/hcsshim v0.8.9

diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI=
+bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=