Correctly sort pod to be deleted

pkg/controllers/job/job_controller_actions.go

@@ -19,6 +19,8 @@ package job
 import (
 	"fmt"
 	"sort"
+	"strconv"
+	"strings"
 	"sync"
 	"sync/atomic"
 
@@ -330,7 +332,11 @@ func (cc *Controller) syncJob(jobInfo *apis.JobInfo, updateStatus state.UpdateSt
 	// Delete pods when scale down.
 	// sort pods to be deleted from higher order to lower
 	sort.Slice(podToDelete, func(i, j int) bool {
-		return podToDelete[i].Name > podToDelete[j].Name
+		iName := strings.Split(podToDelete[i].Name, "-")
+		jName := strings.Split(podToDelete[j].Name, "-")
+		iIndex, _ := strconv.Atoi(iName[len(iName)-1])
+		jIndex, _ := strconv.Atoi(jName[len(jName)-1])
+		return iIndex > jIndex
 	})
 	// Delete unnecessary pods.
 	waitDeletionGroup := sync.WaitGroup{}

pkg/controllers/job/job_controller_handler.go

@@ -85,7 +85,7 @@ func (cc *Controller) updateJob(oldObj, newObj interface{}) {
 
 	// NOTE: Since we only reconcile job based on Spec, we will ignore other attributes
 	// For Job status, it's used internally and always been updated via our controller.
-	if reflect.DeepEqual(newJob.Spec, oldJob.Spec) && newJob.Status.State.Phase == oldJob.Status.State.Phase {
+	if reflect.DeepEqual(newJob.Spec, oldJob.Spec) {
 		klog.V(6).Infof("Job update event is ignored since no update in 'Spec'.")
 		return
 	}