diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go index 139205e10b..7bb71a82b8 100644 --- a/pkg/consts/consts.go +++ b/pkg/consts/consts.go @@ -45,6 +45,10 @@ var ( MaxBucketLifecycleRules = 100 AsyncWorkloadsExpirationDays = int64(7) + ReservedContainerPorts = []int32{ + ProxyListeningPortInt32, + AdminPortInt32, + } ReservedContainerNames = []string{ "dequeuer", "proxy", diff --git a/pkg/operator/resources/job/taskapi/job.go b/pkg/operator/resources/job/taskapi/job.go index 2362ced32c..8410e21786 100644 --- a/pkg/operator/resources/job/taskapi/job.go +++ b/pkg/operator/resources/job/taskapi/job.go @@ -69,10 +69,6 @@ func SubmitJob(apiName string, submission *schema.TaskJobSubmission) (*spec.Task return nil, err } - if err := createJobConfigMap(*apiSpec, jobSpec); err != nil { - return nil, err - } - deployJob(apiSpec, &jobSpec) return &jobSpec, nil @@ -88,21 +84,13 @@ func uploadJobSpec(jobSpec *spec.TaskJob) error { return nil } -func createJobConfigMap(apiSpec spec.API, jobSpec spec.TaskJob) error { - configMapConfig := workloads.ConfigMapConfig{ - TaskJob: &jobSpec, - } - - configMapData, err := configMapConfig.GenerateConfigMapData() +func deployJob(apiSpec *spec.API, jobSpec *spec.TaskJob) { + err := createJobConfigMap(*apiSpec, *jobSpec) if err != nil { - return err + handleJobSubmissionError(jobSpec.JobKey, err) } - return createK8sConfigMap(k8sConfigMap(apiSpec, jobSpec, configMapData)) -} - -func deployJob(apiSpec *spec.API, jobSpec *spec.TaskJob) { - err := createK8sJob(apiSpec, jobSpec) + err = createK8sJob(apiSpec, jobSpec) if err != nil { handleJobSubmissionError(jobSpec.JobKey, err) } @@ -113,6 +101,19 @@ func deployJob(apiSpec *spec.API, jobSpec *spec.TaskJob) { } } +func createJobConfigMap(apiSpec spec.API, jobSpec spec.TaskJob) error { + configMapConfig := workloads.ConfigMapConfig{ + TaskJob: &jobSpec, + } + + configMapData, err := configMapConfig.GenerateConfigMapData() + if err != nil { + return err + } + + return createK8sConfigMap(k8sConfigMap(apiSpec, jobSpec, configMapData)) +} + func handleJobSubmissionError(jobKey spec.JobKey, jobErr error) { jobLogger, err := operator.GetJobLogger(jobKey) if err != nil { diff --git a/pkg/types/spec/validations.go b/pkg/types/spec/validations.go index 1bea4949ed..db997c1272 100644 --- a/pkg/types/spec/validations.go +++ b/pkg/types/spec/validations.go @@ -165,10 +165,7 @@ func podValidation(kind userconfig.Kind) *cr.StructFieldValidation { AllowExplicitNull: true, GreaterThan: pointer.Int32(0), LessThanOrEqualTo: pointer.Int32(65535), - DisallowedValues: []int32{ - consts.ProxyListeningPortInt32, - consts.AdminPortInt32, - }, + DisallowedValues: consts.ReservedContainerPorts, }, }, containersValidation(kind), @@ -366,10 +363,7 @@ func httpGetProbeValidation() *cr.StructFieldValidation { Required: true, GreaterThan: pointer.Int32(0), LessThanOrEqualTo: pointer.Int32(65535), - DisallowedValues: []int32{ - consts.ProxyListeningPortInt32, - consts.AdminPortInt32, - }, + DisallowedValues: consts.ReservedContainerPorts, }, }, }, @@ -391,10 +385,7 @@ func tcpSocketProbeValidation() *cr.StructFieldValidation { Required: true, GreaterThan: pointer.Int32(0), LessThanOrEqualTo: pointer.Int32(65535), - DisallowedValues: []int32{ - consts.ProxyListeningPortInt32, - consts.AdminPortInt32, - }, + DisallowedValues: consts.ReservedContainerPorts, }, }, },