set default restart policy

kubeflow · Apr 2, 2020 · a83d474 · a83d474
1 parent 4a45379
commit a83d474
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkg/apis/kubeflow/v1alpha2/constants.go b/pkg/apis/kubeflow/v1alpha2/constants.go
@@ -14,7 +14,11 @@
 
 package v1alpha2
 
+import common "github.com/kubeflow/common/pkg/apis/common/v1"
+
 const (
 	// EnvKubeflowNamespace is ENV for kubeflow namespace specified by user.
 	EnvKubeflowNamespace = "KUBEFLOW_NAMESPACE"
+	// DefaultRestartPolicy is default RestartPolicy for TFReplicaSpec.
+	DefaultRestartPolicy = common.RestartPolicyNever
 )
diff --git a/pkg/apis/kubeflow/v1alpha2/default.go b/pkg/apis/kubeflow/v1alpha2/default.go
@@ -31,16 +31,16 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 // setDefaultsTypeLauncher sets the default value to launcher.
 func setDefaultsTypeLauncher(spec *common.ReplicaSpec) {
-	if spec != nil {
-		// Only a `RestartPolicy` equal to `Never` or `OnFailure` is allowed for `Job`.
-		if spec.RestartPolicy != common.RestartPolicyNever {
-			spec.RestartPolicy = common.RestartPolicyOnFailure
-		}
+	if spec != nil && spec.RestartPolicy == "" {
+		spec.RestartPolicy = DefaultRestartPolicy
 	}
 }
 
 // setDefaultsTypeWorker sets the default value to worker.
 func setDefaultsTypeWorker(spec *common.ReplicaSpec) {
+	if spec != nil && spec.RestartPolicy == "" {
+		spec.RestartPolicy = DefaultRestartPolicy
+	}
 }
 
 func SetDefaults_MPIJob(mpiJob *MPIJob) {