kubeflow
/
mpi-operator
mirror of https://github.com/kubeflow/mpi-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to modify v1 API instead (#221) 

Signed-off-by: terrytangyuan <terrytangyuan@gmail.com>
This commit is contained in:
Yuan Tang 2020-04-18 23:29:36 -04:00 committed by GitHub
parent 9dd3daf7bd
commit 94a21577df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/kubeflow/v1/default.go
View File

@ -44,12 +44,6 @@ func setDefaultsTypeWorker(spec *common.ReplicaSpec) {
}
func SetDefaults_MPIJob(mpiJob *MPIJob) {
// set default BackoffLimit
if mpiJob.Spec.BackoffLimit == nil {
mpiJob.Spec.BackoffLimit = new(int32)
*mpiJob.Spec.BackoffLimit = 6
}
// Set default cleanpod policy to None.
if mpiJob.Spec.CleanPodPolicy == nil {
none := common.CleanPodPolicyNone

16
pkg/apis/kubeflow/v1/openapi_generated.go
View File

@ -348,20 +348,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
Format: "int32",
},
},
"backoffLimit": {
SchemaProps: spec.SchemaProps{
Description: "Specifies the number of retries before marking this job failed. Defaults to 6.",
Type: []string{"integer"},
Format: "int32",
},
},
"activeDeadlineSeconds": {
SchemaProps: spec.SchemaProps{
Description: "Specifies the duration in seconds relative to the start time that the job may be active before the system tries to terminate it. Note that this takes precedence over `BackoffLimit` field.",
Type: []string{"integer"},
Format: "int64",
},
},
"cleanPodPolicy": {
SchemaProps: spec.SchemaProps{
Description: "CleanPodPolicy defines the policy that whether to kill pods after the job completes. Defaults to None.",
@ -391,7 +377,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"runPolicy": {
SchemaProps: spec.SchemaProps{
Description: "`RunPolicy` encapsulates various runtime policies of the distributed training job, for example how to clean up resources and how long the job can stay active. The policies specified in `RunPolicy` take precedence over the following fields: `BackoffLimit` and `ActiveDeadlineSeconds`.",
Description: "`RunPolicy` encapsulates various runtime policies of the distributed training job, for example how to clean up resources and how long the job can stay active.",
Ref: ref("github.com/kubeflow/common/pkg/apis/common/v1.RunPolicy"),
},
},

14
pkg/apis/kubeflow/v1/types.go
View File

@ -44,17 +44,6 @@ type MPIJobSpec struct {
// +optional
SlotsPerWorker *int32 `json:"slotsPerWorker,omitempty"`
// Specifies the number of retries before marking this job failed.
// Defaults to 6.
// +optional
BackoffLimit *int32 `json:"backoffLimit,omitempty"`
// Specifies the duration in seconds relative to the start time that
// the job may be active before the system tries to terminate it.
// Note that this takes precedence over `BackoffLimit` field.
// +optional
ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"`
// CleanPodPolicy defines the policy that whether to kill pods after the job completes.
// Defaults to None.
CleanPodPolicy *common.CleanPodPolicy `json:"cleanPodPolicy,omitempty"`
@ -69,8 +58,7 @@ type MPIJobSpec struct {
// `RunPolicy` encapsulates various runtime policies of the distributed training
// job, for example how to clean up resources and how long the job can stay
// active. The policies specified in `RunPolicy` take precedence over
// the following fields: `BackoffLimit` and `ActiveDeadlineSeconds`.
// active.
RunPolicy *common.RunPolicy `json:"runPolicy,omitempty"`
}

10
pkg/apis/kubeflow/v1/zz_generated.deepcopy.go
View File

@ -92,16 +92,6 @@ func (in *MPIJobSpec) DeepCopyInto(out *MPIJobSpec) {
*out = new(int32)
**out = **in
}
if in.BackoffLimit != nil {
in, out := &in.BackoffLimit, &out.BackoffLimit
*out = new(int32)
**out = **in
}
if in.ActiveDeadlineSeconds != nil {
in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
*out = new(int64)
**out = **in
}
if in.CleanPodPolicy != nil {
in, out := &in.CleanPodPolicy, &out.CleanPodPolicy
*out = new(commonv1.CleanPodPolicy)

17
pkg/controllers/v1/mpi_job_controller.go
View File

@ -1324,19 +1324,6 @@ func (c *MPIJobController) newLauncher(mpiJob *kubeflow.MPIJob, kubectlDeliveryI
},
},
})
backOffLimit := mpiJob.Spec.BackoffLimit
activeDeadlineSeconds := mpiJob.Spec.ActiveDeadlineSeconds
if mpiJob.Spec.RunPolicy != nil {
warnMsg := fmt.Sprintf(
"runPolicy is specified in MPIJobSpec so backOffLimit/activeDeadlineSeconds in MPIJobSpec will be overwritten")
glog.Warning(warnMsg)
if mpiJob.Spec.RunPolicy.BackoffLimit != nil {
backOffLimit = mpiJob.Spec.RunPolicy.BackoffLimit
}
if mpiJob.Spec.RunPolicy.ActiveDeadlineSeconds != nil {
activeDeadlineSeconds = mpiJob.Spec.RunPolicy.ActiveDeadlineSeconds
}
}
return &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: launcherName,
@ -1347,8 +1334,8 @@ func (c *MPIJobController) newLauncher(mpiJob *kubeflow.MPIJob, kubectlDeliveryI
},
},
Spec: batchv1.JobSpec{
BackoffLimit: backOffLimit,
ActiveDeadlineSeconds: activeDeadlineSeconds,
BackoffLimit: mpiJob.Spec.RunPolicy.BackoffLimit,
ActiveDeadlineSeconds: mpiJob.Spec.RunPolicy.ActiveDeadlineSeconds,
Template: *podSpec,
},
}