From 2ade07a1d9a8ed61f6d4530dbf7d80d44247f414 Mon Sep 17 00:00:00 2001 From: shiyan Date: Thu, 14 Jul 2022 16:44:33 +0800 Subject: [PATCH] pod state from updating to Normal should all hooked (#1022) Signed-off-by: shiyan2016 --- pkg/controller/cloneset/sync/cloneset_update.go | 2 +- pkg/controller/statefulset/stateful_set_control.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/cloneset/sync/cloneset_update.go b/pkg/controller/cloneset/sync/cloneset_update.go index 5a692437b2..828135efe2 100644 --- a/pkg/controller/cloneset/sync/cloneset_update.go +++ b/pkg/controller/cloneset/sync/cloneset_update.go @@ -170,7 +170,7 @@ func (c *realControl) refreshPodState(cs *appsv1alpha1.CloneSet, coreControl clo switch lifecycle.GetPodLifecycleState(pod) { case appspub.LifecycleStateUpdating: if opts.CheckPodUpdateCompleted(pod) == nil { - if cs.Spec.Lifecycle != nil && !lifecycle.IsPodHooked(cs.Spec.Lifecycle.InPlaceUpdate, pod) { + if cs.Spec.Lifecycle != nil && !lifecycle.IsPodAllHooked(cs.Spec.Lifecycle.InPlaceUpdate, pod) { state = appspub.LifecycleStateUpdated } else { state = appspub.LifecycleStateNormal diff --git a/pkg/controller/statefulset/stateful_set_control.go b/pkg/controller/statefulset/stateful_set_control.go index 2f5e213328..7eafc6e9a6 100644 --- a/pkg/controller/statefulset/stateful_set_control.go +++ b/pkg/controller/statefulset/stateful_set_control.go @@ -828,7 +828,7 @@ func (ssc *defaultStatefulSetControl) refreshPodState(set *appsv1beta1.StatefulS switch lifecycle.GetPodLifecycleState(pod) { case appspub.LifecycleStateUpdating: if opts.CheckPodUpdateCompleted(pod) == nil { - if set.Spec.Lifecycle != nil && !lifecycle.IsPodHooked(set.Spec.Lifecycle.InPlaceUpdate, pod) { + if set.Spec.Lifecycle != nil && !lifecycle.IsPodAllHooked(set.Spec.Lifecycle.InPlaceUpdate, pod) { state = appspub.LifecycleStateUpdated } else { state = appspub.LifecycleStateNormal