Fix sidecarset inconsistentStatus always True bug when restart, close #…

…1636
openkruise · Jun 6, 2024 · dda1a99 · dda1a99
1 parent 145a9af
commit dda1a99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/controller/sidecarset/sidecarset_processor.go b/pkg/controller/sidecarset/sidecarset_processor.go
@@ -626,7 +626,7 @@ func inconsistentStatus(sidecarSet *appsv1alpha1.SidecarSet, status *appsv1alpha
 		status.ReadyPods != sidecarSet.Status.ReadyPods ||
 		status.UpdatedReadyPods != sidecarSet.Status.UpdatedReadyPods ||
 		status.LatestRevision != sidecarSet.Status.LatestRevision ||
-		status.CollisionCount != sidecarSet.Status.CollisionCount
+		(sidecarSet.Status.CollisionCount == nil || status.CollisionCount == nil || *status.CollisionCount != *sidecarSet.Status.CollisionCount)
 }
 
 func isSidecarSetUpdateFinish(status *appsv1alpha1.SidecarSetStatus) bool {