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

job: API warn when name is not DNS label

Browse Source
This commit is contained in:
Tim Hockin 2022-12-11 13:33:19 -08:00
parent b65cec86eb
commit fec8e721b2
No known key found for this signature in database
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/registry/batch/job/strategy.go
View File

@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
@ -39,7 +40,7 @@ import (
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/api/pod"
"k8s.io/kubernetes/pkg/apis/batch" "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/apis/core"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath" "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) generateSelector(job)
} }
opts := validationOptionsForJob(job, nil) 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 var newPodTemplate, oldPodTemplate *core.PodTemplateSpec
if newJob != nil { if newJob != nil {
newPodTemplate = &newJob.Spec.Template newPodTemplate = &newJob.Spec.Template
@ -165,7 +166,7 @@ func validationOptionsForJob(newJob, oldJob *batch.Job) validation.JobValidation
if oldJob != nil { if oldJob != nil {
oldPodTemplate = &oldJob.Spec.Template oldPodTemplate = &oldJob.Spec.Template
} }
opts := validation.JobValidationOptions{ opts := batchvalidation.JobValidationOptions{
PodValidationOptions: pod.GetValidationOptionsFromPodTemplate(newPodTemplate, oldPodTemplate), PodValidationOptions: pod.GetValidationOptionsFromPodTemplate(newPodTemplate, oldPodTemplate),
AllowTrackingAnnotation: true, AllowTrackingAnnotation: true,
} }
@ -192,7 +193,12 @@ func validationOptionsForJob(newJob, oldJob *batch.Job) validation.JobValidation
// WarningsOnCreate returns warnings for the creation of the given object. // WarningsOnCreate returns warnings for the creation of the given object.
func (jobStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []string { func (jobStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []string {
newJob := obj.(*batch.Job) 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 // 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) oldJob := old.(*batch.Job)
opts := validationOptionsForJob(job, oldJob) opts := validationOptionsForJob(job, oldJob)
validationErrorList := validation.ValidateJob(job, opts) validationErrorList := batchvalidation.ValidateJob(job, opts)
updateErrorList := validation.ValidateJobUpdate(job, oldJob, opts) updateErrorList := batchvalidation.ValidateJobUpdate(job, oldJob, opts)
return append(validationErrorList, updateErrorList...) 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 { 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. // WarningsOnUpdate returns warnings for the given update.