Include parent job ID as a Docker container label (#17843)

Fixes: #17751
hashicorp · Jul 10, 2023 · b31e891 · b31e891
1 parent 34105f1
commit b31e891
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 234 deletions.
diff --git a/.changelog/17843.txt b/.changelog/17843.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+docker: Added option for labeling container with parent job ID of periodic/dispatch jobs
+```
diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go
@@ -1144,6 +1144,7 @@ func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig {
 		Namespace:     alloc.Namespace,
 		NodeName:      alloc.NodeName,
 		NodeID:        alloc.NodeID,
+		ParentJobID:   alloc.Job.ParentID,
 		Resources: &drivers.Resources{
 			NomadResources: taskResources,
 			LinuxResources: &drivers.LinuxResources{

diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go
@@ -74,6 +74,7 @@ const (
 	dockerLabelNamespace     = "com.hashicorp.nomad.namespace"
 	dockerLabelNodeName      = "com.hashicorp.nomad.node_name"
 	dockerLabelNodeID        = "com.hashicorp.nomad.node_id"
+	dockerLabelParentJobID   = "com.hashicorp.nomad.parent_job_id"
 )
 
 type pauseContainerStore struct {
@@ -1324,6 +1325,9 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
 		if glob.Glob(configurationExtraLabel, "job_id") {
 			labels[dockerLabelJobID] = task.JobID
 		}
+		if glob.Glob(configurationExtraLabel, "parent_job_id") && len(task.ParentJobID) > 0 {
+			labels[dockerLabelParentJobID] = task.ParentJobID
+		}
 		if glob.Glob(configurationExtraLabel, "task_group_name") {
 			labels[dockerLabelTaskGroupName] = task.TaskGroupName
 		}

diff --git a/plugins/drivers/driver.go b/plugins/drivers/driver.go
@@ -274,6 +274,7 @@ type TaskConfig struct {
 	JobName          string
 	JobID            string
 	TaskGroupName    string
+	ParentJobID      string
 	Name             string // task.Name
 	Namespace        string
 	NodeName         string