From 838beb4db343980492ccaca850fbd2c1ceb66509 Mon Sep 17 00:00:00 2001 From: Tasos Maschalidis Date: Tue, 17 Dec 2024 17:38:24 +0200 Subject: [PATCH] Take DOKKU_FORCE_TTY setting into account for run commands with k3s-scheduler --- plugins/scheduler-k3s/k8s.go | 2 +- plugins/scheduler-k3s/triggers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scheduler-k3s/k8s.go b/plugins/scheduler-k3s/k8s.go index 1e8245fc8..009317633 100644 --- a/plugins/scheduler-k3s/k8s.go +++ b/plugins/scheduler-k3s/k8s.go @@ -385,7 +385,7 @@ func (k KubernetesClient) ExecCommand(ctx context.Context, input ExecCommandInpu size := t.GetSize() sizeQueue := t.MonitorSize(size) - actuallyTty := sizeQueue != nil + actuallyTty := (sizeQueue != nil) || os.Getenv("DOKKU_FORCE_TTY") == "true" if actuallyTty { req.Param("tty", "true") diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go index 1b3bbbcf1..2b5bb67c3 100644 --- a/plugins/scheduler-k3s/triggers.go +++ b/plugins/scheduler-k3s/triggers.go @@ -1142,7 +1142,7 @@ func TriggerSchedulerRun(scheduler string, appName string, envCount int, args [] Image: image, ImagePullSecrets: imagePullSecrets, ImageSourceType: imageSourceType, - Interactive: attachToPod, + Interactive: attachToPod || os.Getenv("DOKKU_FORCE_TTY") == "true", Labels: labels, Namespace: namespace, ProcessType: processType,