Add Status subresource to ClusterGroup CRD

antrea-io · Jan 23, 2021 · 86c8106 · 86c8106
1 parent 4d6bdaf
commit 86c8106
Show file tree

Hide file tree

Showing 14 changed files with 278 additions and 15 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -62,7 +62,15 @@ spec:
     singular: group
   scope: Cluster
   versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - description: The overall summary of realization status of the ClusterGroup.
+      jsonPath: .status.phase
+      name: Realization Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
@@ -79,9 +87,18 @@ spec:
               podSelector:
                 x-kubernetes-preserve-unknown-fields: true
             type: object
+          status:
+            properties:
+              observedGeneration:
+                type: integer
+              phase:
+                type: string
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1196,6 +1213,12 @@ rules:
   - get
   - watch
   - list
+- apiGroups:
+  - core.antrea.tanzu.vmware.com
+  resources:
+  - clustergroups/status
+  verbs:
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -62,7 +62,15 @@ spec:
     singular: group
   scope: Cluster
   versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - description: The overall summary of realization status of the ClusterGroup.
+      jsonPath: .status.phase
+      name: Realization Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
@@ -79,9 +87,18 @@ spec:
               podSelector:
                 x-kubernetes-preserve-unknown-fields: true
             type: object
+          status:
+            properties:
+              observedGeneration:
+                type: integer
+              phase:
+                type: string
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1196,6 +1213,12 @@ rules:
   - get
   - watch
   - list
+- apiGroups:
+  - core.antrea.tanzu.vmware.com
+  resources:
+  - clustergroups/status
+  verbs:
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -62,7 +62,15 @@ spec:
     singular: group
   scope: Cluster
   versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - description: The overall summary of realization status of the ClusterGroup.
+      jsonPath: .status.phase
+      name: Realization Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
@@ -79,9 +87,18 @@ spec:
               podSelector:
                 x-kubernetes-preserve-unknown-fields: true
             type: object
+          status:
+            properties:
+              observedGeneration:
+                type: integer
+              phase:
+                type: string
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1196,6 +1213,12 @@ rules:
   - get
   - watch
   - list
+- apiGroups:
+  - core.antrea.tanzu.vmware.com
+  resources:
+  - clustergroups/status
+  verbs:
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -62,7 +62,15 @@ spec:
     singular: group
   scope: Cluster
   versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - description: The overall summary of realization status of the ClusterGroup.
+      jsonPath: .status.phase
+      name: Realization Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
@@ -79,9 +87,18 @@ spec:
               podSelector:
                 x-kubernetes-preserve-unknown-fields: true
             type: object
+          status:
+            properties:
+              observedGeneration:
+                type: integer
+              phase:
+                type: string
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1196,6 +1213,12 @@ rules:
   - get
   - watch
   - list
+- apiGroups:
+  - core.antrea.tanzu.vmware.com
+  resources:
+  - clustergroups/status
+  verbs:
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -62,7 +62,15 @@ spec:
     singular: group
   scope: Cluster
   versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - description: The overall summary of realization status of the ClusterGroup.
+      jsonPath: .status.phase
+      name: Realization Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
@@ -79,9 +87,18 @@ spec:
               podSelector:
                 x-kubernetes-preserve-unknown-fields: true
             type: object
+          status:
+            properties:
+              observedGeneration:
+                type: integer
+              phase:
+                type: string
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1196,6 +1213,12 @@ rules:
   - get
   - watch
   - list
+- apiGroups:
+  - core.antrea.tanzu.vmware.com
+  resources:
+  - clustergroups/status
+  verbs:
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/build/yamls/base/controller-rbac.yml b/build/yamls/base/controller-rbac.yml
@@ -153,6 +153,12 @@ rules:
       - get
       - watch
       - list
+  - apiGroups:
+    - core.antrea.tanzu.vmware.com
+    resources:
+      - clustergroups/status
+    verbs:
+      - update
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/build/yamls/base/crds.yml b/build/yamls/base/crds.yml
@@ -700,6 +700,14 @@ spec:
     - name: v1alpha2
       served: true
       storage: true
+      additionalPrinterColumns:
+        - name: Realization Status
+          type: string
+          description: The overall summary of realization status of the ClusterGroup.
+          jsonPath: .status.phase
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
       schema:
         openAPIV3Schema:
           type: object
@@ -717,6 +725,15 @@ spec:
                     cidr:
                       type: string
                       format: cidr
+            status:
+              type: object
+              properties:
+                phase:
+                  type: string
+                observedGeneration:
+                  type: integer
+      subresources:
+        status: {}
   scope: Cluster
   names:
     plural: clustergroups

diff --git a/pkg/apis/core/v1alpha2/types.go b/pkg/apis/core/v1alpha2/types.go
@@ -79,15 +79,17 @@ type ExternalEntityList struct {
 
 // +genclient
 // +genclient:nonNamespaced
-// +genclient:noStatus
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type ClusterGroup struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard metadata of the object.
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+
 	// Desired state of the group.
-	Spec GroupSpec `json:"spec,omitempty"`
+	Spec GroupSpec `json:"spec"`
+	// Most recently observed status of the group.
+	Status GroupStatus `json:"status"`
 }
 
 type GroupSpec struct {
@@ -110,6 +112,25 @@ type GroupSpec struct {
 	IPBlock *secv1a1.IPBlock `json:"ipBlock,omitempty"`
 }
 
+// GroupPhase defines the phase in which a Group is.
+type GroupPhase string
+
+// These are the valid values for GroupPhase.
+const (
+	// GroupPending means the Group has been accepted by the system, but it has not been processed by Antrea.
+	GroupPending GroupPhase = "Pending"
+	// GroupRealized means the Group has realized all of its GroupMembers.
+	GroupRealized GroupPhase = "Realized"
+)
+
+// GroupStatus represents information about the status of a Group.
+type GroupStatus struct {
+	// The phase of a Group is a simple, high-level summary of the Group's status.
+	Phase GroupPhase `json:"phase"`
+	// The generation observed by Antrea.
+	ObservedGeneration int64 `json:"observedGeneration"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type ClusterGroupList struct {

diff --git a/pkg/apis/core/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha2/zz_generated.deepcopy.go