Bumping k8s dependencies to 1.13
This commit is contained in:
11
vendor/k8s.io/kubernetes/pkg/registry/batch/job/strategy.go
generated
vendored
11
vendor/k8s.io/kubernetes/pkg/registry/batch/job/strategy.go
generated
vendored
@@ -30,10 +30,12 @@ import (
|
||||
"k8s.io/apiserver/pkg/registry/rest"
|
||||
"k8s.io/apiserver/pkg/storage"
|
||||
"k8s.io/apiserver/pkg/storage/names"
|
||||
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
||||
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
||||
"k8s.io/kubernetes/pkg/api/pod"
|
||||
"k8s.io/kubernetes/pkg/apis/batch"
|
||||
"k8s.io/kubernetes/pkg/apis/batch/validation"
|
||||
"k8s.io/kubernetes/pkg/features"
|
||||
)
|
||||
|
||||
// jobStrategy implements verification logic for Replication Controllers.
|
||||
@@ -61,6 +63,10 @@ func (jobStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
|
||||
job := obj.(*batch.Job)
|
||||
job.Status = batch.JobStatus{}
|
||||
|
||||
if !utilfeature.DefaultFeatureGate.Enabled(features.TTLAfterFinished) {
|
||||
job.Spec.TTLSecondsAfterFinished = nil
|
||||
}
|
||||
|
||||
pod.DropDisabledAlphaFields(&job.Spec.Template.Spec)
|
||||
}
|
||||
|
||||
@@ -70,6 +76,11 @@ func (jobStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object
|
||||
oldJob := old.(*batch.Job)
|
||||
newJob.Status = oldJob.Status
|
||||
|
||||
if !utilfeature.DefaultFeatureGate.Enabled(features.TTLAfterFinished) {
|
||||
newJob.Spec.TTLSecondsAfterFinished = nil
|
||||
oldJob.Spec.TTLSecondsAfterFinished = nil
|
||||
}
|
||||
|
||||
pod.DropDisabledAlphaFields(&newJob.Spec.Template.Spec)
|
||||
pod.DropDisabledAlphaFields(&oldJob.Spec.Template.Spec)
|
||||
}
|
||||
|
Reference in New Issue
Block a user