github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

remove equalReady and replace with k8 util function

Browse Source
This commit is contained in:
kannon92 2023-07-05 20:11:48 +00:00
parent a88defe09a
commit 921b7e6e8f
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/job/job_controller.go
View File

@ -893,7 +893,7 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (rErr error) {
} }
} }
needsStatusUpdate := suspendCondChanged || active != job.Status.Active || !equalReady(ready, job.Status.Ready) needsStatusUpdate := suspendCondChanged || active != job.Status.Active || !pointer.Int32Equal(ready, job.Status.Ready)
job.Status.Active = active job.Status.Active = active
job.Status.Ready = ready job.Status.Ready = ready
err = jm.trackJobStatusAndRemoveFinalizers(ctx, &job, pods, prevSucceededIndexes, *uncounted, expectedRmFinalizers, finishedCondition, needsStatusUpdate, newBackoffRecord) err = jm.trackJobStatusAndRemoveFinalizers(ctx, &job, pods, prevSucceededIndexes, *uncounted, expectedRmFinalizers, finishedCondition, needsStatusUpdate, newBackoffRecord)
@ -1744,10 +1744,3 @@ func countReadyPods(pods []*v1.Pod) int32 {
} }
return cnt return cnt
} }
func equalReady(a, b *int32) bool {
if a != nil && b != nil {
return *a == *b
}
return a == b
}