restart policy should default to always

Signed-off-by: vsoch <[email protected]>
flux-framework · Jul 22, 2024 · 6d4b7b9 · 6d4b7b9
1 parent c5dc811
commit 6d4b7b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/controllers/flux/job.go b/controllers/flux/job.go
@@ -70,13 +70,17 @@ func NewMiniClusterJob(cluster *api.MiniCluster) (*batchv1.Job, error) {
 					ImagePullSecrets:             getImagePullSecrets(cluster),
 					ServiceAccountName:           cluster.Spec.Pod.ServiceAccountName,
 					AutomountServiceAccountToken: &cluster.Spec.Pod.AutomountServiceAccountToken,
-					RestartPolicy:                corev1.RestartPolicy(cluster.Spec.Pod.RestartPolicy),
+					RestartPolicy:                corev1.RestartPolicyAlways,
 					NodeSelector:                 cluster.Spec.Pod.NodeSelector,
 					SchedulerName:                cluster.Spec.Pod.SchedulerName,
 				},
 			},
 		},
 	}
+	// Custom restart policy
+	if cluster.Spec.Pod.RestartPolicy != "" {
+		job.Spec.Template.Spec.RestartPolicy = corev1.RestartPolicy(cluster.Spec.Pod.RestartPolicy)
+	}
 
 	// Only add runClassName if defined
 	if cluster.Spec.Pod.RuntimeClassName != "" {

diff --git a/controllers/flux/pods.go b/controllers/flux/pods.go
@@ -135,13 +135,18 @@ func (r *MiniClusterReconciler) newServicePod(
 			SetHostnameAsFQDN:            &setAsFQDN,
 			Volumes:                      existingVolumes,
 			ImagePullSecrets:             getImagePullSecrets(cluster),
-			RestartPolicy:                corev1.RestartPolicy(cluster.Spec.Pod.RestartPolicy),
+			RestartPolicy:                corev1.RestartPolicyAlways,
 			ServiceAccountName:           cluster.Spec.Pod.ServiceAccountName,
 			AutomountServiceAccountToken: &cluster.Spec.Pod.AutomountServiceAccountToken,
 			NodeSelector:                 cluster.Spec.Pod.NodeSelector,
 		},
 	}
 
+	// Custom restart policy
+	if cluster.Spec.Pod.RestartPolicy != "" {
+		pod.Spec.RestartPolicy = corev1.RestartPolicy(cluster.Spec.Pod.RestartPolicy)
+	}
+
 	// Only add runClassName if defined
 	if cluster.Spec.Pod.RuntimeClassName != "" {
 		pod.Spec.RuntimeClassName = &cluster.Spec.Pod.RuntimeClassName