diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 251aef081ad..7e985b8d88e 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -827,10 +827,7 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (rErr error) { newSucceededPods, newFailedPods := getNewFinishedPods(jobCtx) jobCtx.succeeded = job.Status.Succeeded + int32(len(newSucceededPods)) + int32(len(jobCtx.uncounted.succeeded)) jobCtx.failed = job.Status.Failed + int32(nonIgnoredFailedPodsCount(jobCtx, newFailedPods)) + int32(len(jobCtx.uncounted.failed)) - var ready *int32 - if feature.DefaultFeatureGate.Enabled(features.JobReadyPods) { - ready = ptr.To(countReadyPods(jobCtx.activePods)) - } + ready := ptr.To(countReadyPods(jobCtx.activePods)) // Job first start. Set StartTime only if the job is not in the suspended state. if job.Status.StartTime == nil && !jobSuspended(&job) { diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 70321bcea70..98e756a9b60 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -345,13 +345,6 @@ const ( // based on the set of succeeded pods. JobSuccessPolicy featuregate.Feature = "JobSuccessPolicy" - // owner: @alculquicondor - // alpha: v1.23 - // beta: v1.24 - // - // Track the number of pods with Ready condition in the Job status. - JobReadyPods featuregate.Feature = "JobReadyPods" - // owner: @marquiz // kep: http://kep.k8s.io/4033 // alpha: v1.28 @@ -1041,8 +1034,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS JobSuccessPolicy: {Default: false, PreRelease: featuregate.Alpha}, - JobReadyPods: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31 - KubeletCgroupDriverFromCRI: {Default: false, PreRelease: featuregate.Alpha}, KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha},