scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38913 from jianhuiz/batch-job-validate-status-update

Browse Source 
Automatic merge from submit-queue

fix swapped new/old job obj for validating object meta update

@nikhiljindal
This commit is contained in:
Kubernetes Submit Queue
2017-01-03 03:08:47 -08:00
committed by GitHub
parent 8088ea426d 0e5d7c3fc0
commit c73d2457b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/batch/validation/validation.go
View File

@@ -132,13 +132,13 @@ func ValidateJobStatus(status *batch.JobStatus, fldPath *field.Path) field.Error
} }
func ValidateJobUpdate(job, oldJob *batch.Job) field.ErrorList { func ValidateJobUpdate(job, oldJob *batch.Job) field.ErrorList {
allErrs := apivalidation.ValidateObjectMetaUpdate(&oldJob.ObjectMeta, &job.ObjectMeta, field.NewPath("metadata")) allErrs := apivalidation.ValidateObjectMetaUpdate(&job.ObjectMeta, &oldJob.ObjectMeta, field.NewPath("metadata"))
allErrs = append(allErrs, ValidateJobSpecUpdate(job.Spec, oldJob.Spec, field.NewPath("spec"))...) allErrs = append(allErrs, ValidateJobSpecUpdate(job.Spec, oldJob.Spec, field.NewPath("spec"))...)
return allErrs return allErrs
} }
func ValidateJobUpdateStatus(job, oldJob *batch.Job) field.ErrorList { func ValidateJobUpdateStatus(job, oldJob *batch.Job) field.ErrorList {
allErrs := apivalidation.ValidateObjectMetaUpdate(&oldJob.ObjectMeta, &job.ObjectMeta, field.NewPath("metadata")) allErrs := apivalidation.ValidateObjectMetaUpdate(&job.ObjectMeta, &oldJob.ObjectMeta, field.NewPath("metadata"))
allErrs = append(allErrs, ValidateJobStatusUpdate(job.Status, oldJob.Status)...) allErrs = append(allErrs, ValidateJobStatusUpdate(job.Status, oldJob.Status)...)
return allErrs return allErrs
} }