diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index ceae5bb6879..6f9789ad488 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" @@ -39,7 +40,7 @@ import ( "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" + batchvalidation "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" "sigs.k8s.io/structured-merge-diff/v4/fieldpath" @@ -154,10 +155,10 @@ func (jobStrategy) Validate(ctx context.Context, obj runtime.Object) field.Error generateSelector(job) } opts := validationOptionsForJob(job, nil) - return validation.ValidateJob(job, opts) + return batchvalidation.ValidateJob(job, opts) } -func validationOptionsForJob(newJob, oldJob *batch.Job) validation.JobValidationOptions { +func validationOptionsForJob(newJob, oldJob *batch.Job) batchvalidation.JobValidationOptions { var newPodTemplate, oldPodTemplate *core.PodTemplateSpec if newJob != nil { newPodTemplate = &newJob.Spec.Template @@ -165,7 +166,7 @@ func validationOptionsForJob(newJob, oldJob *batch.Job) validation.JobValidation if oldJob != nil { oldPodTemplate = &oldJob.Spec.Template } - opts := validation.JobValidationOptions{ + opts := batchvalidation.JobValidationOptions{ PodValidationOptions: pod.GetValidationOptionsFromPodTemplate(newPodTemplate, oldPodTemplate), AllowTrackingAnnotation: true, } @@ -192,7 +193,12 @@ func validationOptionsForJob(newJob, oldJob *batch.Job) validation.JobValidation // WarningsOnCreate returns warnings for the creation of the given object. func (jobStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []string { newJob := obj.(*batch.Job) - return pod.GetWarningsForPodTemplate(ctx, field.NewPath("spec", "template"), &newJob.Spec.Template, nil) + var warnings []string + if msgs := utilvalidation.IsDNS1123Label(newJob.Name); len(msgs) != 0 { + warnings = append(warnings, fmt.Sprintf("metadata.name: this is used in Pod names and hostnames, which can result in surprising behavior; a DNS label is recommended: %v", msgs)) + } + warnings = append(warnings, pod.GetWarningsForPodTemplate(ctx, field.NewPath("spec", "template"), &newJob.Spec.Template, nil)...) + return warnings } // generateSelector adds a selector to a job and labels to its template @@ -264,8 +270,8 @@ func (jobStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) oldJob := old.(*batch.Job) opts := validationOptionsForJob(job, oldJob) - validationErrorList := validation.ValidateJob(job, opts) - updateErrorList := validation.ValidateJobUpdate(job, oldJob, opts) + validationErrorList := batchvalidation.ValidateJob(job, opts) + updateErrorList := batchvalidation.ValidateJobUpdate(job, oldJob, opts) return append(validationErrorList, updateErrorList...) } @@ -303,7 +309,7 @@ func (jobStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime. } func (jobStatusStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList { - return validation.ValidateJobUpdateStatus(obj.(*batch.Job), old.(*batch.Job)) + return batchvalidation.ValidateJobUpdateStatus(obj.(*batch.Job), old.(*batch.Job)) } // WarningsOnUpdate returns warnings for the given update.