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

Merge pull request #125168 from kaisoz/jobreadypods-fg-removal

Browse Source 
Remove the `JobReadyPods` feature flag
This commit is contained in:
Kubernetes Prow Robot 2024-06-05 11:36:58 -07:00 committed by GitHub
commit d8b33e32b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,10 +827,7 @@ func (jm *Controller) syncJob(ctx context.Context, key string) (rErr error) {
newSucceededPods, newFailedPods := getNewFinishedPods(jobCtx) newSucceededPods, newFailedPods := getNewFinishedPods(jobCtx)
jobCtx.succeeded = job.Status.Succeeded + int32(len(newSucceededPods)) + int32(len(jobCtx.uncounted.succeeded)) 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)) jobCtx.failed = job.Status.Failed + int32(nonIgnoredFailedPodsCount(jobCtx, newFailedPods)) + int32(len(jobCtx.uncounted.failed))
var ready *int32 ready := ptr.To(countReadyPods(jobCtx.activePods))
if feature.DefaultFeatureGate.Enabled(features.JobReadyPods) {
ready = ptr.To(countReadyPods(jobCtx.activePods))
}
// Job first start. Set StartTime only if the job is not in the suspended state. // Job first start. Set StartTime only if the job is not in the suspended state.
if job.Status.StartTime == nil && !jobSuspended(&job) { if job.Status.StartTime == nil && !jobSuspended(&job) {

9
pkg/features/kube_features.go
View File

@ -346,13 +346,6 @@ const (
// based on the set of succeeded pods. // based on the set of succeeded pods.
JobSuccessPolicy featuregate.Feature = "JobSuccessPolicy" 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 // owner: @marquiz
// kep: http://kep.k8s.io/4033 // kep: http://kep.k8s.io/4033
// alpha: v1.28 // alpha: v1.28
@ -1050,8 +1043,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
JobSuccessPolicy: {Default: false, PreRelease: featuregate.Alpha}, JobSuccessPolicy: {Default: false, PreRelease: featuregate.Alpha},
JobReadyPods: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
KubeletCgroupDriverFromCRI: {Default: false, PreRelease: featuregate.Alpha}, KubeletCgroupDriverFromCRI: {Default: false, PreRelease: featuregate.Alpha},
KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha},