1. adapter.go: GetReplicaDetails returns pods in the subset

2. xxx_adapter.go: return pods implementation ⬆️ 3. allocator.go: about safeReplica 4. pod_condition_utils.go: extract PodUnscheduledTimeout function from workloadwpread 5. reschedule.go: PodUnscheduledTimeout function extracted 6. subset.go: add some field to Subset object to carry related information 7. subset_control.go: store subset pods to Subset object 8. uniteddeployment_controller.go 1. add requeue feature to check failed pods 2. subset unschedulable status management 9. uniteddeployment_types.go: API change 10. uniteddeployment_update.go: sync unschedulable to CR Signed-off-by: AiRanthem <[email protected]>
openkruise · Sep 2, 2024 · 75b4117 · 75b4117
1 parent 89bffc8
commit 75b4117
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/e2e-1.18.yaml b/.github/workflows/e2e-1.18.yaml
@@ -168,7 +168,7 @@ jobs:
           export KUBECONFIG=/home/runner/.kube/config
           make ginkgo
           set +e
-          ./bin/ginkgo -timeout 60m -v --focus='\[apps\] (PullImage|ContainerRecreateRequest|PullImages)' test/e2e
+          ./bin/ginkgo -timeout 60m -v -p --focus='\[apps\] (PullImage|ContainerRecreateRequest|PullImages)' test/e2e
           retVal=$?
           restartCount=$(kubectl get pod -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $4}')
           if [ "${restartCount}" -eq "0" ];then

diff --git a/.github/workflows/e2e-1.20-EphemeralJob.yaml b/.github/workflows/e2e-1.20-EphemeralJob.yaml
@@ -75,7 +75,7 @@ jobs:
           export KUBECONFIG=/home/runner/.kube/config
           make ginkgo
           set +e
-          ./bin/ginkgo -timeout 60m -v --focus='\[apps\] EphemeralJob' test/e2e
+          ./bin/ginkgo -timeout 60m -v -p --focus='\[apps\] EphemeralJob' test/e2e
           retVal=$?
           restartCount=$(kubectl get pod -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $4}')
           if [ "${restartCount}" -eq "0" ];then

diff --git a/.github/workflows/e2e-1.24.yaml b/.github/workflows/e2e-1.24.yaml
@@ -77,7 +77,7 @@ jobs:
           export KUBECONFIG=/home/runner/.kube/config
           make ginkgo
           set +e
-          ./bin/ginkgo -timeout 60m -v --focus='\[apps\] StatefulSet' test/e2e
+          ./bin/ginkgo -timeout 60m -v -p --focus='\[apps\] StatefulSet' test/e2e
           retVal=$?
           restartCount=$(kubectl get pod -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $4}')
           if [ "${restartCount}" -eq "0" ];then

diff --git a/.github/workflows/e2e-1.26.yaml b/.github/workflows/e2e-1.26.yaml
@@ -76,7 +76,7 @@ jobs:
           export KUBECONFIG=/home/runner/.kube/config
           make ginkgo
           set +e
-          ./bin/ginkgo -timeout 60m -v --focus='\[apps\] StatefulSet' test/e2e
+          ./bin/ginkgo -timeout 60m -v -p --focus='\[apps\] StatefulSet' test/e2e
           retVal=$?
           restartCount=$(kubectl get pod -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $4}')
           if [ "${restartCount}" -eq "0" ];then

diff --git a/.github/workflows/e2e-1.28.yaml b/.github/workflows/e2e-1.28.yaml
@@ -76,7 +76,7 @@ jobs:
           export KUBECONFIG=/home/runner/.kube/config
           make ginkgo
           set +e
-          ./bin/ginkgo -timeout 60m -v --focus='\[apps\] StatefulSet' test/e2e
+          ./bin/ginkgo -timeout 60m -v -p --focus='\[apps\] StatefulSet' test/e2e
           retVal=$?
           restartCount=$(kubectl get pod -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $4}')
           if [ "${restartCount}" -eq "0" ];then

diff --git a/test/e2e/apps/uniteddeployment.go b/test/e2e/apps/uniteddeployment.go
@@ -103,6 +103,7 @@ var _ = SIGDescribe("uniteddeployment", func() {
 		}
 
 		udManager := tester.NewUnitedDeploymentManager("adaptive-ud-elastic-test")
+		udManager.UnitedDeployment.Spec.Template.DeploymentTemplate.Spec.Template.Spec.TerminationGracePeriodSeconds = ptr.To(int64(0))
 		// enable adaptive scheduling
 		udManager.UnitedDeployment.Spec.Topology.ScheduleStrategy = appsv1alpha1.UnitedDeploymentScheduleStrategy{
 			Type: appsv1alpha1.AdaptiveUnitedDeploymentScheduleStrategyType,
@@ -242,6 +243,7 @@ var _ = SIGDescribe("uniteddeployment", func() {
 		}
 
 		udManager := tester.NewUnitedDeploymentManager("adaptive-ud-specific-test")
+		udManager.UnitedDeployment.Spec.Template.DeploymentTemplate.Spec.Template.Spec.TerminationGracePeriodSeconds = ptr.To(int64(0))
 		// enable adaptive scheduling
 		udManager.UnitedDeployment.Spec.Topology.ScheduleStrategy = appsv1alpha1.UnitedDeploymentScheduleStrategy{
 			Type: appsv1alpha1.AdaptiveUnitedDeploymentScheduleStrategyType,

diff --git a/test/e2e/framework/uniteddeployment.go b/test/e2e/framework/uniteddeployment.go
@@ -32,8 +32,6 @@ func NewUnitedDeploymentTester(c clientset.Interface, kc kruiseclientset.Interfa
 	}
 }
 
-var zero = int64(0)
-
 func (t *UnitedDeploymentTester) NewUnitedDeploymentManager(name string) *UnitedDeploymentManager {
 	return &UnitedDeploymentManager{
 		UnitedDeployment: &appsv1alpha1.UnitedDeployment{
@@ -67,7 +65,6 @@ func (t *UnitedDeploymentTester) NewUnitedDeploymentManager(name string) *United
 									},
 								},
 								Spec: v1.PodSpec{
-									TerminationGracePeriodSeconds: &zero,
 									Containers: []v1.Container{
 										{
 											Name:  "busybox",