Merge pull request #809 from fengcone/feature/public-fix-allocation-finalizer

fix(kubernetes): remove pool allocation finalizer on detach

Author: Generalwin

kubernetes/internal/controller/batchsandbox_pause_resume.go

@@ -446,6 +446,7 @@ func (r *BatchSandboxReconciler) completePause(ctx context.Context, bs *sandboxv
 			patch := client.MergeFrom(latest.DeepCopy())
 			latest.Spec.Template = pooledTemplate.DeepCopy()
 			latest.Spec.PoolRef = ""
+			controllerutil.RemoveFinalizer(latest, FinalizerPoolAllocation)
 			if latest.Annotations != nil {
 				delete(latest.Annotations, AnnoAllocReleaseKey)
 			}
@@ -455,6 +456,7 @@ func (r *BatchSandboxReconciler) completePause(ctx context.Context, bs *sandboxv
 		}
 		bs.Spec.Template = pooledTemplate.DeepCopy()
 		bs.Spec.PoolRef = ""
+		controllerutil.RemoveFinalizer(bs, FinalizerPoolAllocation)
 		if bs.Annotations != nil {
 			delete(bs.Annotations, AnnoAllocReleaseKey)
 		}
@@ -561,6 +563,7 @@ func (r *BatchSandboxReconciler) continueResume(ctx context.Context, bs *sandbox
 
 		if latest.Spec.PoolRef != "" {
 			latest.Spec.PoolRef = ""
+			controllerutil.RemoveFinalizer(latest, FinalizerPoolAllocation)
 		}
 
 		if err := r.Patch(ctx, latest, patch); err != nil {

kubernetes/internal/controller/batchsandbox_pause_resume_test.go

@@ -37,6 +37,7 @@ import (
 	sandboxv1alpha1 "github.com/alibaba/OpenSandbox/sandbox-k8s/apis/sandbox/v1alpha1"
 	taskscheduler "github.com/alibaba/OpenSandbox/sandbox-k8s/internal/scheduler"
 	"github.com/alibaba/OpenSandbox/sandbox-k8s/internal/utils/fieldindex"
+	taskexecutor "github.com/alibaba/OpenSandbox/sandbox-k8s/pkg/task-executor"
 )
 
 // newTestReconciler creates a BatchSandboxReconciler with a fake client for testing.
@@ -80,6 +81,11 @@ func (f *forbiddenTaskScheduler) StopTask() []taskscheduler.Task {
 	return nil
 }
 
+func (f *forbiddenTaskScheduler) AddTasks(_ []*taskexecutor.Task) error {
+	f.t.Fatalf("task scheduler should not add tasks while sandbox is paused")
+	return nil
+}
+
 type fakeSchedulerTask struct {
 	name     string
 	state    taskscheduler.TaskState
@@ -128,6 +134,10 @@ func (r *recordingTaskScheduler) StopTask() []taskscheduler.Task {
 	return r.tasks
 }
 
+func (r *recordingTaskScheduler) AddTasks(_ []*taskexecutor.Task) error {
+	return nil
+}
+
 // ---------- dispatchPauseResume 5-case tests ----------
 
 func TestDispatchPauseResume_Case1_PauseTrue(t *testing.T) {
@@ -932,6 +942,7 @@ func TestContinueResume_PoolMode(t *testing.T) {
 			Namespace:  "default",
 			Generation: 2,
 			UID:        "test-uid",
+			Finalizers: []string{FinalizerPoolAllocation},
 		},
 		Spec: sandboxv1alpha1.BatchSandboxSpec{
 			Pause:    ptr.To(false),
@@ -958,6 +969,7 @@ func TestContinueResume_PoolMode(t *testing.T) {
 	updated := &sandboxv1alpha1.BatchSandbox{}
 	require.NoError(t, r.Get(context.Background(), types.NamespacedName{Namespace: "default", Name: "test-bs"}, updated))
 	assert.Equal(t, "", updated.Spec.PoolRef)
+	assert.NotContains(t, updated.Finalizers, FinalizerPoolAllocation)
 }
 
 func TestContinueResume_UsesPatchedTemplateWhenCacheReturnsStaleObject(t *testing.T) {
@@ -2054,6 +2066,7 @@ func TestCompletePause_PooledSandboxDetachesForPoolGC(t *testing.T) {
 			Namespace:  "default",
 			Generation: 2,
 			UID:        "test-bs-uid",
+			Finalizers: []string{FinalizerPoolAllocation},
 		},
 		Spec: sandboxv1alpha1.BatchSandboxSpec{
 			Pause:    ptr.To(true),
@@ -2107,6 +2120,7 @@ func TestCompletePause_PooledSandboxDetachesForPoolGC(t *testing.T) {
 	assert.NotContains(t, updated.Spec.Template.Labels, LabelPoolRevision)
 	assert.Equal(t, "", updated.Spec.Template.Spec.NodeName)
 	assert.NotContains(t, updated.Annotations, AnnoAllocReleaseKey)
+	assert.NotContains(t, updated.Finalizers, FinalizerPoolAllocation)
 }
 
 func TestCompletePause_PooledSandboxDoesNotDeleteSourcePod(t *testing.T) {