From 9caacd4877b1376c452d11f44982327915da98a9 Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Sun, 16 Feb 2020 20:39:57 +0800 Subject: [PATCH] Added env var for scheduler name. Signed-off-by: Klaus Ma --- pkg/cli/vsub/run.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkg/cli/vsub/run.go b/pkg/cli/vsub/run.go index 27b50d6135..979c79e087 100644 --- a/pkg/cli/vsub/run.go +++ b/pkg/cli/vsub/run.go @@ -18,6 +18,7 @@ package vsub import ( "fmt" + "os" "github.com/spf13/cobra" @@ -57,7 +58,21 @@ func InitRunFlags(cmd *cobra.Command) { cmd.Flags().IntVarP(&launchJobFlags.Replicas, "replicas", "r", 1, "the total tasks of job") cmd.Flags().StringVarP(&launchJobFlags.Requests, "requests", "R", "cpu=1000m,memory=100Mi", "the resource request of the task") cmd.Flags().StringVarP(&launchJobFlags.Limits, "limits", "L", "cpu=1000m,memory=100Mi", "the resource limit of the task") - cmd.Flags().StringVarP(&launchJobFlags.SchedulerName, "scheduler", "S", "volcano", "the scheduler for this job") + cmd.Flags().StringVarP(&launchJobFlags.SchedulerName, "scheduler", "S", "", "the scheduler for this job, overwrite the value of 'VOLCANO_SCHEDULER_NAME' (default \"volcano\")") + + setDefaultArgs() +} + +func setDefaultArgs() { + if launchJobFlags.SchedulerName == "" { + schedulerName := os.Getenv("VOLCANO_SCHEDULER_NAME") + + if schedulerName != "" { + launchJobFlags.SchedulerName = schedulerName + } else { + launchJobFlags.SchedulerName = "volcano" + } + } } var jobName = "job.volcano.sh"