fix: cloneset revision update (#1549)

qswksp · zmberg · commit 99ca57c1809a · 2024-04-03T10:39:20.000+08:00
Signed-off-by: suhe &lt;suhe@njust.edu.cn&gt;
diff --git a/pkg/controller/cloneset/cloneset_status.go b/pkg/controller/cloneset/cloneset_status.go
@@ -104,8 +104,8 @@ func (r *realStatusUpdater) calculateStatus(cs *appsv1alpha1.CloneSet, newStatus
 			newStatus.UpdatedAvailableReplicas++
 		}
 	}
-	// Consider the update revision as stable if revisions of all pods are consistent to it, no need to wait all of them ready
-	if newStatus.UpdatedReplicas == newStatus.Replicas {
+	// Consider the update revision as stable if revisions of all pods are consistent to it and have the expected number of replicas, no need to wait all of them ready
+	if newStatus.UpdatedReplicas == newStatus.Replicas && newStatus.Replicas == *cs.Spec.Replicas {
 		newStatus.CurrentRevision = newStatus.UpdateRevision
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ func (r realStatusUpdater) calculateStatus(cs appsv1alpha1.CloneSet, newStatus`
`104`	`104`	`newStatus.UpdatedAvailableReplicas++`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`- // Consider the update revision as stable if revisions of all pods are consistent to it, no need to wait all of them ready`
`108`		`- if newStatus.UpdatedReplicas == newStatus.Replicas {`
	`107`	`+ // Consider the update revision as stable if revisions of all pods are consistent to it and have the expected number of replicas, no need to wait all of them ready`
	`108`	`+ if newStatus.UpdatedReplicas == newStatus.Replicas && newStatus.Replicas == *cs.Spec.Replicas {`
`109`	`109`	`newStatus.CurrentRevision = newStatus.UpdateRevision`
`110`	`110`	`}`
`111`	`111`