add ut test case for asts lifecycle

Signed-off-by: Abner-1 <yuanyuxing.yyx@alibaba-inc.com>
openkruise · Dec 13, 2024 · feea050 · feea050
1 parent 5bfd15c
commit feea050
Show file tree

Hide file tree

Showing 4 changed files with 561 additions and 7 deletions.
diff --git a/pkg/controller/cloneset/sync/cloneset_update_test.go b/pkg/controller/cloneset/sync/cloneset_update_test.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	testingclock "k8s.io/utils/clock/testing"
 
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -34,7 +35,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
-	testingclock "k8s.io/utils/clock/testing"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 

diff --git a/pkg/controller/statefulset/stateful_set_control.go b/pkg/controller/statefulset/stateful_set_control.go
@@ -770,11 +770,8 @@ func (ssc *defaultStatefulSetControl) deletePod(set *appsv1beta1.StatefulSet, po
 }
 
 func (ssc *defaultStatefulSetControl) refreshPodState(set *appsv1beta1.StatefulSet, pod *v1.Pod, updateRevision string) (bool, time.Duration, error) {
-	if set.Spec.UpdateStrategy.RollingUpdate == nil {
-		return false, 0, nil
-	}
 	opts := &inplaceupdate.UpdateOptions{}
-	if set.Spec.UpdateStrategy.RollingUpdate.InPlaceUpdateStrategy != nil {
+	if set.Spec.UpdateStrategy.RollingUpdate != nil && set.Spec.UpdateStrategy.RollingUpdate.InPlaceUpdateStrategy != nil {
 		opts.GracePeriodSeconds = set.Spec.UpdateStrategy.RollingUpdate.InPlaceUpdateStrategy.GracePeriodSeconds
 	}
 	opts = inplaceupdate.SetOptionsDefaults(opts)
@@ -791,7 +788,7 @@ func (ssc *defaultStatefulSetControl) refreshPodState(set *appsv1beta1.StatefulS
 	case appspub.LifecycleStatePreparingNormal:
 		if set.Spec.Lifecycle == nil ||
 			set.Spec.Lifecycle.PreNormal == nil ||
-			lifecycle.IsPodHooked(set.Spec.Lifecycle.PreNormal, pod) {
+			lifecycle.IsPodAllHooked(set.Spec.Lifecycle.PreNormal, pod) {
 			state = appspub.LifecycleStateNormal
 		}
 	case appspub.LifecycleStatePreparingUpdate: