Make NotificationSummaries per cluster

projectsveltos · Feb 15, 2023 · 0e289df · 0e289df
1 parent 036ed5b
commit 0e289df
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 63 deletions.
diff --git a/api/v1alpha1/clusterhealthcheck_type.go b/api/v1alpha1/clusterhealthcheck_type.go
@@ -88,6 +88,10 @@ type ClusterCondition struct {
 	// Cluster conditions.
 	// +optional
 	Conditions []Condition `json:"conditions,omitempty"`
+
+	// NotificationSummaries contains status information on notifications
+	// +optional
+	NotificationSummaries []NotificationSummary `json:"notificationSummaries,omitempty"`
 }
 
 // Event specifies different type of liveness checks
@@ -184,14 +188,10 @@ type ClusterHealthCheckStatus struct {
 	// ClusterHealthCheck ClusterSelector
 	MatchingClusterRefs []corev1.ObjectReference `json:"matchingClusters,omitempty"`
 
-	// ClusterConditions contains conditions for all clusters matching
-	// ClusterHealthCheck instance
+	// ClusterConditions contains conditions and notification status for all clusters
+	// matching ClusterHealthCheck instance
 	// +optional
 	ClusterConditions []ClusterCondition `json:"clusterCondition,omitempty"`
-
-	// NotificationSummaries contains status information on notifications
-	// +optional
-	NotificationSummaries []NotificationSummary `json:"notificationSummaries,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/lib.projectsveltos.io_clusterhealthchecks.yaml b/config/crd/bases/lib.projectsveltos.io_clusterhealthchecks.yaml
@@ -161,8 +161,8 @@ spec:
           status:
             properties:
               clusterCondition:
-                description: ClusterConditions contains conditions for all clusters
-                  matching ClusterHealthCheck instance
+                description: ClusterConditions contains conditions and notification
+                  status for all clusters matching ClusterHealthCheck instance
                 items:
                   properties:
                     clusterInfo:
@@ -270,6 +270,30 @@ spec:
                         - type
                         type: object
                       type: array
+                    notificationSummaries:
+                      description: NotificationSummaries contains status information
+                        on notifications
+                      items:
+                        properties:
+                          failureMessage:
+                            description: FailureMessage is a human consumable message
+                              explaining the misconfiguration
+                            type: string
+                          name:
+                            description: Name of the notification check.
+                            type: string
+                          status:
+                            description: NotificationStatus specifies the notification
+                              status
+                            enum:
+                            - Delivered
+                            - FailedToDeliver
+                            type: string
+                        required:
+                        - name
+                        - status
+                        type: object
+                      type: array
                   required:
                   - clusterInfo
                   type: object
@@ -338,29 +362,6 @@ spec:
                       type: string
                   type: object
                 type: array
-              notificationSummaries:
-                description: NotificationSummaries contains status information on
-                  notifications
-                items:
-                  properties:
-                    failureMessage:
-                      description: FailureMessage is a human consumable message explaining
-                        the misconfiguration
-                      type: string
-                    name:
-                      description: Name of the notification check.
-                      type: string
-                    status:
-                      description: NotificationStatus specifies the notification status
-                      enum:
-                      - Delivered
-                      - FailedToDeliver
-                      type: string
-                  required:
-                  - name
-                  - status
-                  type: object
-                type: array
             type: object
         type: object
     served: true

diff --git a/lib/crd/clusterhealthchecks.go b/lib/crd/clusterhealthchecks.go
@@ -180,8 +180,8 @@ spec:
           status:
             properties:
               clusterCondition:
-                description: ClusterConditions contains conditions for all clusters
-                  matching ClusterHealthCheck instance
+                description: ClusterConditions contains conditions and notification
+                  status for all clusters matching ClusterHealthCheck instance
                 items:
                   properties:
                     clusterInfo:
@@ -289,6 +289,30 @@ spec:
                         - type
                         type: object
                       type: array
+                    notificationSummaries:
+                      description: NotificationSummaries contains status information
+                        on notifications
+                      items:
+                        properties:
+                          failureMessage:
+                            description: FailureMessage is a human consumable message
+                              explaining the misconfiguration
+                            type: string
+                          name:
+                            description: Name of the notification check.
+                            type: string
+                          status:
+                            description: NotificationStatus specifies the notification
+                              status
+                            enum:
+                            - Delivered
+                            - FailedToDeliver
+                            type: string
+                        required:
+                        - name
+                        - status
+                        type: object
+                      type: array
                   required:
                   - clusterInfo
                   type: object
@@ -357,29 +381,6 @@ spec:
                       type: string
                   type: object
                 type: array
-              notificationSummaries:
-                description: NotificationSummaries contains status information on
-                  notifications
-                items:
-                  properties:
-                    failureMessage:
-                      description: FailureMessage is a human consumable message explaining
-                        the misconfiguration
-                      type: string
-                    name:
-                      description: Name of the notification check.
-                      type: string
-                    status:
-                      description: NotificationStatus specifies the notification status
-                      enum:
-                      - Delivered
-                      - FailedToDeliver
-                      type: string
-                  required:
-                  - name
-                  - status
-                  type: object
-                type: array
             type: object
         type: object
     served: true