fix pod hang in PreparingUpdate state when rollback before update hook

Signed-off-by: shiyan2016 <shiyan20160606@gmail.com>
openkruise · Jan 5, 2023 · d0081e6 · d0081e6
1 parent bab1a31
commit d0081e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/controller/cloneset/sync/cloneset_update.go b/pkg/controller/cloneset/sync/cloneset_update.go
@@ -174,7 +174,7 @@ func (c *realControl) refreshPodState(cs *appsv1alpha1.CloneSet, coreControl clo
 			lifecycle.IsPodAllHooked(cs.Spec.Lifecycle.PreNormal, pod) {
 			state = appspub.LifecycleStateNormal
 		}
-	case appspub.LifecycleStateUpdating:
+	case appspub.LifecycleStatePreparingUpdate, appspub.LifecycleStateUpdating:
 		if opts.CheckPodUpdateCompleted(pod) == nil {
 			if cs.Spec.Lifecycle != nil && !lifecycle.IsPodAllHooked(cs.Spec.Lifecycle.InPlaceUpdate, pod) {
 				state = appspub.LifecycleStateUpdated

diff --git a/pkg/controller/statefulset/stateful_set_control.go b/pkg/controller/statefulset/stateful_set_control.go
@@ -857,7 +857,7 @@ func (ssc *defaultStatefulSetControl) refreshPodState(set *appsv1beta1.StatefulS
 
 	var state appspub.LifecycleStateType
 	switch lifecycle.GetPodLifecycleState(pod) {
-	case appspub.LifecycleStateUpdating:
+	case appspub.LifecycleStatePreparingUpdate, appspub.LifecycleStateUpdating:
 		if opts.CheckPodUpdateCompleted(pod) == nil {
 			if set.Spec.Lifecycle != nil && !lifecycle.IsPodAllHooked(set.Spec.Lifecycle.InPlaceUpdate, pod) {
 				state = appspub.LifecycleStateUpdated