Merge pull request #444 from yuleichun-striving/release-0.3.0

fix: Elegant deletion of pods in sub-clusters (consistent with k8s)

pkg/clustertree/cluster-manager/controllers/pod/leaf_pod_controller.go

@@ -2,11 +2,13 @@ package pod
 
 import (
 	"context"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -85,9 +87,28 @@ func NewRootDeleteOption(pod *corev1.Pod) client.DeleteOption {
 }
 
 func NewLeafDeleteOption(pod *corev1.Pod) client.DeleteOption {
-	gracePeriodSeconds := new(int64)
-	if pod.DeletionGracePeriodSeconds != nil {
-		gracePeriodSeconds = pod.DeletionGracePeriodSeconds
+	var gracePeriodSeconds *int64
+	// Check if DeletionTimestamp is set and before the current time
+	current := metav1.NewTime(time.Now())
+	if pod.DeletionTimestamp != nil && pod.DeletionTimestamp.Before(&current) {
+		//force
+		gracePeriodSeconds = new(int64)
+	} else {
+		if pod.DeletionGracePeriodSeconds != nil {
+			//DeletionGracePeriodSeconds determines how long it will take before the pod status changes to Termination
+			//wait
+			gracePeriodSeconds = pod.DeletionGracePeriodSeconds
+		} else if pod.Spec.TerminationGracePeriodSeconds != nil {
+			//TerminationGracePeriodSeconds is how long to wait after the pod is marked as Termination state before the container process is forcibly deleted.
+			//wait
+			gracePeriodSeconds = pod.Spec.TerminationGracePeriodSeconds
+		}
+
+		if pod.DeletionGracePeriodSeconds != nil && pod.Spec.TerminationGracePeriodSeconds != nil {
+			//Sum both grace periods
+			totalGracePeriod := *pod.DeletionGracePeriodSeconds + *pod.Spec.TerminationGracePeriodSeconds
+			gracePeriodSeconds = &totalGracePeriod
+		}
 	}
 
 	return &rootDeleteOption{
@@ -163,8 +184,3 @@ func (r *LeafPodReconciler) SetupWithManager(mgr manager.Manager) error {
 		})).
 		Complete(r)
 }
-
-// func ShouldSkipStatusUpdate(pod *corev1.Pod) bool {
-// 	return pod.Status.Phase == corev1.PodSucceeded ||
-// 		pod.Status.Phase == corev1.PodFailed
-// }