dynamically sets job label w/ group name (#229)

update tests
theketchio · Jan 31, 2022 · 30f00e5 · 30f00e5
1 parent 734ecc2
commit 30f00e5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/internal/chart/chartutils_test.go b/internal/chart/chartutils_test.go
@@ -20,26 +20,29 @@ func TestBufferedFiles(t *testing.T) {
 		"test.yaml": "name: {{ App.spec.name }}",
 	}
 	values := jobValues{
-		Job: ketchv1.JobSpec{
-			Version:      "v1",
-			Type:         "Job",
-			Name:         "testjob",
-			Framework:    "myframework",
-			Description:  "this is a test",
-			Parallelism:  2,
-			Completions:  2,
-			Suspend:      false,
-			BackoffLimit: 4,
-			Containers: []ketchv1.Container{
-				{
-					Name:    "test",
-					Image:   "ubuntu",
-					Command: []string{"pwd"},
+		Job: Job{
+			JobSpec: ketchv1.JobSpec{
+				Version:      "v1",
+				Type:         "Job",
+				Name:         "testjob",
+				Framework:    "myframework",
+				Description:  "this is a test",
+				Parallelism:  2,
+				Completions:  2,
+				Suspend:      false,
+				BackoffLimit: 4,
+				Containers: []ketchv1.Container{
+					{
+						Name:    "test",
+						Image:   "ubuntu",
+						Command: []string{"pwd"},
+					},
+				},
+				Policy: ketchv1.Policy{
+					RestartPolicy: "Never",
 				},
 			},
-			Policy: ketchv1.Policy{
-				RestartPolicy: "Never",
-			},
+			Group: "theketch.io",
 		},
 	}
 
@@ -61,6 +64,7 @@ appVersion: v1
     name: test
   description: this is a test
   framework: myframework
+  group: theketch.io
   name: testjob
   parallelism: 2
   policy:

diff --git a/internal/chart/job_chart.go b/internal/chart/job_chart.go
@@ -14,14 +14,22 @@ type JobChart struct {
 }
 
 type jobValues struct {
-	Job ketchv1.JobSpec `json:"job"`
+	Job Job `json:"job"`
+}
+
+type Job struct {
+	ketchv1.JobSpec
+	Group string `json:"group"`
 }
 
 // NewJobChart returns a JobChart instance from a ketchv1.Job and []Option
 func NewJobChart(job *ketchv1.Job, opts ...Option) *JobChart {
 	jobChart := &JobChart{
 		values: jobValues{
-			Job: job.Spec,
+			Job: Job{
+				JobSpec: job.Spec,
+				Group:   ketchv1.Group,
+			},
 		},
 	}
 	options := &Options{}

diff --git a/internal/chart/job_chart_test.go b/internal/chart/job_chart_test.go
@@ -48,7 +48,10 @@ func TestNewJobChart(t *testing.T) {
 	}
 	expected := &JobChart{
 		values: jobValues{
-			Job: testJob.Spec,
+			Job: Job{
+				JobSpec: testJob.Spec,
+				Group:   "theketch.io",
+			},
 		},
 		templates: map[string]string{"test.yaml": "Lots of values"},
 	}

diff --git a/internal/templates/job/yamls/job.yaml b/internal/templates/job/yamls/job.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   labels:
-    theketch.io/app-name: {{ $.Values.job.name | quote }}
+    {{ $.Values.job.group }}/job-name: {{ $.Values.job.name | quote }}
   name: {{ $.Values.job.name | quote }}
 spec:
   {{- if $.Values.job.parallelism }}