From afb0e92d8fa3437bfb7751105a6eb98052b99218 Mon Sep 17 00:00:00 2001 From: changzhen Date: Tue, 11 Jun 2024 20:48:52 +0800 Subject: [PATCH] fix-remedy-e2e-errors Signed-off-by: changzhen --- pkg/controllers/remediation/remedy_controller.go | 2 +- pkg/controllers/status/cluster_status_controller.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/controllers/remediation/remedy_controller.go b/pkg/controllers/remediation/remedy_controller.go index c8424dea1a56..b8cd6ac5effe 100644 --- a/pkg/controllers/remediation/remedy_controller.go +++ b/pkg/controllers/remediation/remedy_controller.go @@ -93,7 +93,7 @@ func (c *RemedyController) Reconcile(ctx context.Context, req controllerruntime. klog.Errorf("Failed to sync cluster(%s) remedy actions: %v", cluster.Name, err) return controllerruntime.Result{}, err } - klog.V(4).Infof("Success to sync cluster(%s) remedy actions", cluster.Name) + klog.V(4).Infof("Success to sync cluster(%s) remedy actions: %v", cluster.Name, actions) return controllerruntime.Result{}, nil } diff --git a/pkg/controllers/status/cluster_status_controller.go b/pkg/controllers/status/cluster_status_controller.go index d94bff005344..cd344bed343e 100644 --- a/pkg/controllers/status/cluster_status_controller.go +++ b/pkg/controllers/status/cluster_status_controller.go @@ -277,7 +277,11 @@ func (c *ClusterStatusController) updateStatusIfNeeded(cluster *clusterv1alpha1. if !equality.Semantic.DeepEqual(cluster.Status, currentClusterStatus) { klog.V(4).Infof("Start to update cluster status: %s", cluster.Name) err := retry.RetryOnConflict(retry.DefaultRetry, func() (err error) { - cluster.Status = currentClusterStatus + cluster.Status.KubernetesVersion = currentClusterStatus.KubernetesVersion + cluster.Status.APIEnablements = currentClusterStatus.APIEnablements + cluster.Status.Conditions = currentClusterStatus.Conditions + cluster.Status.NodeSummary = currentClusterStatus.NodeSummary + cluster.Status.ResourceSummary = currentClusterStatus.ResourceSummary updateErr := c.Status().Update(context.TODO(), cluster) if updateErr == nil { return nil