remove pod finalizer (labring#5060)

* remove pod finalizer * remove pod finalizer * remove pod finalizer
bxy4543 · Sep 10, 2024 · b03274c · b03274c
1 parent d47170c
commit b03274c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/controllers/devbox/go.mod b/controllers/devbox/go.mod
@@ -1,6 +1,6 @@
 module github.com/labring/sealos/controllers/devbox
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/avast/retry-go v2.7.0+incompatible

diff --git a/controllers/devbox/internal/controller/devbox_controller.go b/controllers/devbox/internal/controller/devbox_controller.go
@@ -372,6 +372,16 @@ func commitSuccess(podStatus corev1.PodPhase) bool {
 
 func (r *DevboxReconciler) removeAll(ctx context.Context, devbox *devboxv1alpha1.Devbox, recLabels map[string]string) error {
 	// Delete Pod
+	var podList corev1.PodList
+	if err := r.List(ctx, &podList, client.InNamespace(devbox.Namespace), client.MatchingLabels(recLabels)); err != nil {
+		return err
+	}
+	for _, pod := range podList.Items {
+		controllerutil.RemoveFinalizer(&pod, FinalizerName)
+		if err := r.Update(ctx, &pod); err != nil {
+			return err
+		}
+	}
 	if err := r.deleteResourcesByLabels(ctx, &corev1.Pod{}, devbox.Namespace, recLabels); err != nil {
 		return err
 	}