Merge pull request stolostron#343 from qiujian16/fix-info-bug

Fix nodelist bug

pkg/klusterlet/clusterinfo/clusterinfo_controller.go

@@ -73,7 +73,7 @@ func (r *ClusterInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	// Update cluster info status here.
-	newStatus := clusterv1beta1.ClusterInfoStatus{}
+	newStatus := clusterInfo.DeepCopy().Status
 	var errs []error
 
 	// Config Agent endpoint
@@ -125,38 +125,25 @@ func (r *ClusterInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		Message: "Managed cluster info is synced",
 	}
 	if len(errs) > 0 {
-		newSyncedCondition.Status = metav1.ConditionFalse
-		newSyncedCondition.Reason = clusterv1beta1.ReasonManagedClusterInfoSyncedFailed
-		applyErrors := errors.NewAggregate(errs)
-		newSyncedCondition.Message = applyErrors.Error()
-	}
-
-	needUpdate := false
-	oldStatus := clusterInfo.Status.DeepCopy()
-	oldSyncedCondition := meta.FindStatusCondition(oldStatus.Conditions, clusterv1beta1.ManagedClusterInfoSynced)
-	if oldSyncedCondition != nil {
-		oldSyncedCondition.LastTransitionTime = metav1.Time{}
-		if !equality.Semantic.DeepEqual(newSyncedCondition, *oldSyncedCondition) {
-			needUpdate = true
+		newSyncedCondition = metav1.Condition{
+			Type:    clusterv1beta1.ManagedClusterInfoSynced,
+			Status:  metav1.ConditionFalse,
+			Reason:  clusterv1beta1.ReasonManagedClusterInfoSyncedFailed,
+			Message: errors.NewAggregate(errs).Error(),
 		}
-	} else {
-		needUpdate = true
 	}
 
-	oldStatus.Conditions = []metav1.Condition{}
-	if !equality.Semantic.DeepEqual(newStatus, *oldStatus) {
-		needUpdate = true
+	meta.SetStatusCondition(&newStatus.Conditions, newSyncedCondition)
+
+	if equality.Semantic.DeepEqual(newStatus, clusterInfo.Status) {
+		return ctrl.Result{}, nil
 	}
 
-	if needUpdate {
-		newStatus.Conditions = clusterInfo.Status.Conditions
-		meta.SetStatusCondition(&newStatus.Conditions, newSyncedCondition)
-		clusterInfo.Status = newStatus
-		err = r.Client.Status().Update(ctx, clusterInfo)
-		if err != nil {
-			log.Error(err, "Failed to update status")
-			return ctrl.Result{}, err
-		}
+	clusterInfo.Status = newStatus
+	err = r.Client.Status().Update(ctx, clusterInfo)
+	if err != nil {
+		log.Error(err, "Failed to update status")
+		return ctrl.Result{}, err
 	}
 
 	r.RefreshAgentServer(clusterInfo)

test/e2e/clusterinfos_test.go

@@ -27,6 +27,17 @@ var _ = ginkgo.Describe("Testing ManagedClusterInfo", func() {
 			}, eventuallyTimeout, eventuallyInterval).Should(gomega.BeTrue())
 		})
 
+		ginkgo.It("should have node list reported successfully in cluster", func() {
+			gomega.Eventually(func() error {
+				managedClusterInfo, err := util.GetResource(dynamicClient, clusterInfoGVR, managedClusterName, managedClusterName)
+				if err != nil {
+					return err
+				}
+				// check the ManagedClusterInfo status
+				return util.CheckNodeList(managedClusterInfo)
+			}, eventuallyTimeout, eventuallyInterval).ShouldNot(gomega.HaveOccurred())
+		})
+
 		ginkgo.It("should have a valid condition", func() {
 			gomega.Eventually(func() bool {
 				managedClusterInfo, err := util.GetResource(dynamicClient, clusterInfoGVR, managedClusterName, managedClusterName)

test/e2e/util/util.go

@@ -520,6 +520,19 @@ func GetConditionTypeFromStatus(obj *unstructured.Unstructured, typeName string)
 	return false
 }
 
+func CheckNodeList(obj *unstructured.Unstructured) error {
+	nodeList, found, err := unstructured.NestedSlice(obj.Object, "status", "nodeList")
+	if err != nil || !found {
+		return fmt.Errorf("failed to get nodeList. found:%v, err:%v", found, err)
+	}
+
+	if len(nodeList) == 0 {
+		return fmt.Errorf("expect items in node list")
+	}
+
+	return nil
+}
+
 func CheckDistributionInfo(obj *unstructured.Unstructured) error {
 	distributionInfo, found, err := unstructured.NestedMap(obj.Object, "status", "distributionInfo")
 	if err != nil || !found {