Skip to content

CaaS - nits and fixes #2221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 3, 2021
Merged

CaaS - nits and fixes #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5229e5d
Fix the batch readiness probe
RobertLucian Jun 3, 2021
ba5e715
Revert probe host
RobertLucian Jun 3, 2021
38888c1
Group disallowed ports under a single slice
RobertLucian Jun 3, 2021
fd878a0
Make sure to run handleJobSubmissionError if an error occurs
RobertLucian Jun 3, 2021
c4c9657
Merge branch 'feature/caas-api' into caas/nits-and-fixes
RobertLucian Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ var (
MaxBucketLifecycleRules = 100
AsyncWorkloadsExpirationDays = int64(7)

ReservedContainerPorts = []int32{
ProxyListeningPortInt32,
AdminPortInt32,
}
ReservedContainerNames = []string{
"dequeuer",
"proxy",
Expand Down
33 changes: 17 additions & 16 deletions pkg/operator/resources/job/taskapi/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
Expand All @@ -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 {
Expand Down
15 changes: 3 additions & 12 deletions pkg/types/spec/validations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
},
},
},
Expand All @@ -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,
},
},
},
Expand Down