From 49fe91ed0d5afd31e9110ee402de64098479d427 Mon Sep 17 00:00:00 2001
From: Spground <pingshan.wj@alibaba-inc.com>
Date: Thu, 6 Jun 2024 17:55:41 +0800
Subject: [PATCH] Fix sidecarset inconsistentStatus always True bug when
 restart, close #1636

Signed-off-by: Spground <pingshan.wj@alibaba-inc.com>
---
 pkg/controller/sidecarset/sidecarset_processor.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/controller/sidecarset/sidecarset_processor.go b/pkg/controller/sidecarset/sidecarset_processor.go
index 3307376248..2de09ae146 100644
--- 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 {