Merge pull request #1291 from veophi/fix_update_status

Fix cloneSet extra status update logic
openkruise · May 22, 2023 · 40e62c6 · 40e62c6
2 parents db83b70 + 0a30f70
commit 40e62c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/pkg/controller/cloneset/cloneset_status.go b/pkg/controller/cloneset/cloneset_status.go
@@ -47,32 +47,24 @@ type realStatusUpdater struct {
 
 func (r *realStatusUpdater) UpdateCloneSetStatus(cs *appsv1alpha1.CloneSet, newStatus *appsv1alpha1.CloneSetStatus, pods []*v1.Pod) error {
 	r.calculateStatus(cs, newStatus, pods)
-	extraStatus, modified, err := clonesetcore.New(cs).ExtraStatusCalculation(newStatus, pods)
-	if err != nil {
+	if err := clonesetcore.New(cs).ExtraStatusCalculation(newStatus, pods); err != nil {
 		return fmt.Errorf("failed to calculate extra status for cloneSet %s/%s: %v", cs.Namespace, cs.Name, err)
 	}
-	if !modified && !r.inconsistentStatus(cs, newStatus) {
+	if !r.inconsistentStatus(cs, newStatus) {
 		return nil
 	}
 	klog.Infof("To update CloneSet status for  %s/%s, replicas=%d ready=%d available=%d updated=%d updatedReady=%d, revisions current=%s update=%s",
 		cs.Namespace, cs.Name, newStatus.Replicas, newStatus.ReadyReplicas, newStatus.AvailableReplicas, newStatus.UpdatedReplicas, newStatus.UpdatedReadyReplicas, newStatus.CurrentRevision, newStatus.UpdateRevision)
-	return r.updateStatus(cs, newStatus, extraStatus)
+	return r.updateStatus(cs, newStatus)
 }
 
-func (r *realStatusUpdater) updateStatus(cs *appsv1alpha1.CloneSet, newStatus *appsv1alpha1.CloneSetStatus, extraStatus map[string]string) error {
+func (r *realStatusUpdater) updateStatus(cs *appsv1alpha1.CloneSet, newStatus *appsv1alpha1.CloneSetStatus) error {
 	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		clone := &appsv1alpha1.CloneSet{}
 		if err := r.Get(context.TODO(), types.NamespacedName{Namespace: cs.Namespace, Name: cs.Name}, clone); err != nil {
 			return err
 		}
 		clone.Status = *newStatus
-		clone.Annotations = cs.Annotations
-		if clone.Annotations == nil {
-			clone.Annotations = map[string]string{}
-		}
-		for key, value := range extraStatus {
-			clone.Annotations[key] = value
-		}
 		return r.Status().Update(context.TODO(), clone)
 	})
 }

diff --git a/pkg/controller/cloneset/core/api.go b/pkg/controller/cloneset/core/api.go
@@ -43,7 +43,7 @@ type Control interface {
 	IsPodUpdateReady(pod *v1.Pod, minReadySeconds int32) bool
 	GetPodsSortFunc(pods []*v1.Pod, waitUpdateIndexes []int) func(i, j int) bool
 	GetUpdateOptions() *inplaceupdate.UpdateOptions
-	ExtraStatusCalculation(status *appsv1alpha1.CloneSetStatus, pods []*v1.Pod) (map[string]string, bool, error)
+	ExtraStatusCalculation(status *appsv1alpha1.CloneSetStatus, pods []*v1.Pod) error
 
 	// validation
 	ValidateCloneSetUpdate(oldCS, newCS *appsv1alpha1.CloneSet) error

diff --git a/pkg/controller/cloneset/core/cloneset_core.go b/pkg/controller/cloneset/core/cloneset_core.go
@@ -166,8 +166,8 @@ func (c *commonControl) ValidateCloneSetUpdate(oldCS, newCS *appsv1alpha1.CloneS
 	return nil
 }
 
-func (c *commonControl) ExtraStatusCalculation(status *appsv1alpha1.CloneSetStatus, pods []*v1.Pod) (map[string]string, bool, error) {
-	return nil, false, nil
+func (c *commonControl) ExtraStatusCalculation(status *appsv1alpha1.CloneSetStatus, pods []*v1.Pod) error {
+	return nil
 }
 
 func (c *commonControl) IgnorePodUpdateEvent(oldPod, curPod *v1.Pod) bool {