delay timer is incorrect (#5499)

changluyi · web-flow · commit 0dae9b010011 · 2025-07-25T17:28:03.000+08:00
Signed-off-by: clyi &lt;clyi@alauda.io&gt;
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -357,7 +357,7 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj any) {
 	var delay time.Duration
 	if newPod.Spec.TerminationGracePeriodSeconds != nil {
 		if !newPod.DeletionTimestamp.IsZero() {
-			delay = time.Until(newPod.DeletionTimestamp.Add(time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second))
+			delay = time.Until(newPod.DeletionTimestamp.Time)
 		} else {
 			delay = time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second
 		}

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj any) {`
`357`	`357`	`var delay time.Duration`
`358`	`358`	`if newPod.Spec.TerminationGracePeriodSeconds != nil {`
`359`	`359`	`if !newPod.DeletionTimestamp.IsZero() {`
`360`		`- delay = time.Until(newPod.DeletionTimestamp.Add(time.Duration(newPod.Spec.TerminationGracePeriodSeconds) time.Second))`
	`360`	`+ delay = time.Until(newPod.DeletionTimestamp.Time)`
`361`	`361`	`} else {`
`362`	`362`	`delay = time.Duration(newPod.Spec.TerminationGracePeriodSeconds) time.Second`
`363`	`363`	`}`