feat: default to running one-off k3s containers to a max of 1 day

This follows the standard enforced by Heroku.
This commit is contained in:
Jose Diaz-Gonzalez committed 2025-11-18 14:09:38 -05:00
1 parent d5ea97f7b0
commit 99a1e2ee33
2 files changed
+45 -34

No files matched your search

+21 -19
View File
@@ -349,24 +349,25 @@ type ClusterIssuer struct {
} }
type Job struct { type Job struct {
AppName string AppName string
Command []string Command []string
DeploymentID int64 DeploymentID int64
Entrypoint string Entrypoint string
Env map[string]string Env map[string]string
ID string ID string
Image string Image string
ImagePullSecrets string ImagePullSecrets string
ImageSourceType string ImageSourceType string
Interactive bool Interactive bool
Labels map[string]string Labels map[string]string
Namespace string Namespace string
ProcessType string ProcessType string
Schedule string Schedule string
SecurityContext SecurityContext SecurityContext SecurityContext
Suffix string Suffix string
RemoveContainer bool RemoveContainer bool
WorkingDir string WorkingDir string
ActiveDeadlineSeconds int64
} }
// SecurityContext contains the security context for a process // SecurityContext contains the security context for a process
@@ -479,7 +480,8 @@ func templateKubernetesJob(input Job) (batchv1.Job, error) {
Annotations: annotations, Annotations: annotations,
}, },
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
BackoffLimit: ptr.To(int32(0)), ActiveDeadlineSeconds: ptr.To(input.ActiveDeadlineSeconds),
BackoffLimit: ptr.To(int32(0)),
Template: corev1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: labels, Labels: labels,
+24 -15
View File
@@ -1329,23 +1329,32 @@ func TriggerSchedulerRun(scheduler string, appName string, envCount int, args []
return fmt.Errorf("Error getting security context: %w", err) return fmt.Errorf("Error getting security context: %w", err)
} }
activeDeadlineSeconds := int64(86400) // 24 hours
if os.Getenv("DOKKU_RUN_TTL_SECONDS") != "" {
activeDeadlineSeconds, err = strconv.ParseInt(os.Getenv("DOKKU_RUN_TTL_SECONDS"), 10, 64)
if err != nil {
return fmt.Errorf("Error parsing DOKKU_RUN_TTL_SECONDS value as int64: %w", err)
}
}
workingDir := common.GetWorkingDir(appName, image) workingDir := common.GetWorkingDir(appName, image)
job, err := templateKubernetesJob(Job{ job, err := templateKubernetesJob(Job{
AppName: appName, AppName: appName,
Command: []string{commandShell}, Command: []string{commandShell},
DeploymentID: deploymentID, DeploymentID: deploymentID,
Entrypoint: entrypoint, Entrypoint: entrypoint,
Env: extraEnv, Env: extraEnv,
Image: image, Image: image,
ImagePullSecrets: imagePullSecrets, ImagePullSecrets: imagePullSecrets,
ImageSourceType: imageSourceType, ImageSourceType: imageSourceType,
Interactive: attachToPod || common.ToBool(os.Getenv("DOKKU_FORCE_TTY")), Interactive: attachToPod || common.ToBool(os.Getenv("DOKKU_FORCE_TTY")),
Labels: labels, Labels: labels,
Namespace: namespace, Namespace: namespace,
ProcessType: processType, ProcessType: processType,
RemoveContainer: rmContainer, RemoveContainer: rmContainer,
SecurityContext: securityContext, SecurityContext: securityContext,
WorkingDir: workingDir, WorkingDir: workingDir,
ActiveDeadlineSeconds: activeDeadlineSeconds,
}) })
if err != nil { if err != nil {
return fmt.Errorf("Error templating job: %w", err) return fmt.Errorf("Error templating job: %w", err)