From 6d4b7b96eff78907ca88849e7366b42ec3126d1c Mon Sep 17 00:00:00 2001 From: vsoch Date: Sun, 21 Jul 2024 19:46:17 -0600 Subject: [PATCH] restart policy should default to always Signed-off-by: vsoch --- controllers/flux/job.go | 6 +++++- controllers/flux/pods.go | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/controllers/flux/job.go b/controllers/flux/job.go index e5cda75a..fdbfb0f2 100644 --- 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 index c29801d7..accbb640 100644 --- 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