From 8e2f8f551a97f35ae914bc404f13c40eccc9ba9f Mon Sep 17 00:00:00 2001 From: JieWu <958340585@qq.com> Date: Wed, 12 Jun 2024 11:23:43 +0800 Subject: [PATCH] Fix sidecarset inconsistentStatus always True bug when restart, close #1636 (#1641) Signed-off-by: Spground Co-authored-by: Spground --- 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..ee85f1d601 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 + !pointer.Int32Equal(sidecarSet.Status.CollisionCount, status.CollisionCount) } func isSidecarSetUpdateFinish(status *appsv1alpha1.SidecarSetStatus) bool {