Skip to content

Commit d8b33e3

Browse files
authored
Merge pull request kubernetes#125168 from kaisoz/jobreadypods-fg-removal
Remove the `JobReadyPods` feature flag
2 parents a2911e0 + ce56b2c commit d8b33e3

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

pkg/controller/job/job_controller.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -827,10 +827,7 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (rErr error) {
827827
newSucceededPods, newFailedPods := getNewFinishedPods(jobCtx)
828828
jobCtx.succeeded = job.Status.Succeeded + int32(len(newSucceededPods)) + int32(len(jobCtx.uncounted.succeeded))
829829
jobCtx.failed = job.Status.Failed + int32(nonIgnoredFailedPodsCount(jobCtx, newFailedPods)) + int32(len(jobCtx.uncounted.failed))
830-
var ready *int32
831-
if feature.DefaultFeatureGate.Enabled(features.JobReadyPods) {
832-
ready = ptr.To(countReadyPods(jobCtx.activePods))
833-
}
830+
ready := ptr.To(countReadyPods(jobCtx.activePods))
834831

835832
// Job first start. Set StartTime only if the job is not in the suspended state.
836833
if job.Status.StartTime == nil && !jobSuspended(&job) {

pkg/features/kube_features.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -346,13 +346,6 @@ const (
346346
// based on the set of succeeded pods.
347347
JobSuccessPolicy featuregate.Feature = "JobSuccessPolicy"
348348

349-
// owner: @alculquicondor
350-
// alpha: v1.23
351-
// beta: v1.24
352-
//
353-
// Track the number of pods with Ready condition in the Job status.
354-
JobReadyPods featuregate.Feature = "JobReadyPods"
355-
356349
// owner: @marquiz
357350
// kep: http://kep.k8s.io/4033
358351
// alpha: v1.28
@@ -1050,8 +1043,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10501043

10511044
JobSuccessPolicy: {Default: false, PreRelease: featuregate.Alpha},
10521045

1053-
JobReadyPods: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
1054-
10551046
KubeletCgroupDriverFromCRI: {Default: false, PreRelease: featuregate.Alpha},
10561047

10571048
KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha},

0 commit comments

Comments
 (0)