add: job name override

h3poteto · Mar 2, 2025 · 9b9ae0c · 9b9ae0c
1 parent 6163bf4
commit 9b9ae0c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -10,8 +10,9 @@ import (
 )
 
 type runJob struct {
-	args          string
 	templateFile  string
+	name          string
+	args          string
 	image         string
 	resources     string
 	namespace     string
@@ -31,6 +32,7 @@ func runJobCmd() *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.StringVarP(&r.templateFile, "template-file", "f", "", "Job template file")
+	flags.StringVar(&r.name, "name", "", "Name of the job")
 	flags.StringVar(&r.args, "args", "", "Command which you want to run")
 	flags.StringVar(&r.image, "image", "", "Image which you want to run")
 	flags.StringVar(&r.resources, "resources", "", "Resources which you want to run")
@@ -55,7 +57,7 @@ func (r *runJob) run(cmd *cobra.Command, args []string) {
 	}
 
 	log.Infof("Using config file: %s", config)
-	j, err := job.NewJob(config, r.templateFile, r.args, r.image, r.resources, r.namespace, r.container, (time.Duration(r.timeout) * time.Second))
+	j, err := job.NewJob(config, r.templateFile, r.name, r.args, r.image, r.resources, r.namespace, r.container, (time.Duration(r.timeout) * time.Second))
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/pkg/job/job.go b/pkg/job/job.go
@@ -31,6 +31,8 @@ type Job struct {
 
 	// Batch v1 job struct.
 	CurrentJob *v1.Job
+	// Target pod name
+	Name string
 	// Command which override the current job struct.
 	Args []string
 	// Target docker image.
@@ -47,7 +49,7 @@ type Job struct {
 
 // NewJob returns a new Job struct, and initialize kubernetes client.
 // It read the job definition yaml file, and unmarshal to batch/v1/Job.
-func NewJob(configFile, currentFile, command, image, resources, namespace, container string, timeout time.Duration) (*Job, error) {
+func NewJob(configFile, currentFile, name, command, image, resources, namespace, container string, timeout time.Duration) (*Job, error) {
 	if len(configFile) == 0 {
 		return nil, errors.New("Config file is required")
 	}
@@ -80,7 +82,11 @@ func NewJob(configFile, currentFile, command, image, resources, namespace, conta
 	if err != nil {
 		return nil, err
 	}
-	currentJob.SetName(generateRandomName(currentJob.Name))
+	jobName := currentJob.Name
+	if len(name) > 0 {
+		jobName = name
+	}
+	currentJob.SetName(generateRandomName(jobName))
 	if len(namespace) > 0 {
 		currentJob.SetNamespace(namespace)
 	}
@@ -97,6 +103,7 @@ func NewJob(configFile, currentFile, command, image, resources, namespace, conta
 	return &Job{
 		client,
 		&currentJob,
+		name,
 		args,
 		image,
 		resourceRequirements,

diff --git a/pkg/job/job_test.go b/pkg/job/job_test.go
@@ -113,6 +113,7 @@ func TestRunJob(t *testing.T) {
 	job := &Job{
 		CurrentJob: currentJob,
 		Args:       []string{"hoge", "fuga"},
+		Name:       "alpine-job",
 		Image:      "alpine:latest",
 		Resources: v1core.ResourceRequirements{
 			Requests: v1core.ResourceList{
@@ -191,6 +192,7 @@ func TestWaitJobCompleteWithWaitAll(t *testing.T) {
 	job := &Job{
 		CurrentJob: currentJob,
 		Args:       []string{"hoge", "fuga"},
+		Name:       "alpine-job",
 		Image:      "alpine:latest",
 		Resources: v1core.ResourceRequirements{
 			Requests: v1core.ResourceList{
@@ -294,6 +296,7 @@ func TestWaitJobCompleteForContainer(t *testing.T) {
 	job := &Job{
 		CurrentJob: currentJob,
 		Args:       []string{"hoge", "fuga"},
+		Name:       "alpine-job",
 		Image:      "alpine:latest",
 		Resources: v1core.ResourceRequirements{
 			Requests: v1core.ResourceList{
@@ -553,6 +556,7 @@ func TestRemovePods(t *testing.T) {
 	job := &Job{
 		CurrentJob: currentJob,
 		Args:       []string{"hoge", "fuga"},
+		Name:       "alpine",
 		Image:      "alpine:latest",
 		Resources: v1core.ResourceRequirements{
 			Requests: v1core.ResourceList{