InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9730ffefa5 into df0cb852e7

Browse Source
This commit is contained in:
Lex
2025-01-21 20:08:43 +01:00
committed by GitHub
parent df0cb852e7 9730ffefa5
commit 7bf9aafca2
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/cluster/executor/container/container.go
View File

@@ -38,6 +38,7 @@ const (
// components.
type containerConfig struct {
task *api.Task
node *api.NodeDescription
networksAttachments map[string]*api.NetworkAttachment
}
@@ -71,6 +72,7 @@ func (c *containerConfig) setTask(t *api.Task, node *api.NodeDescription) error
}
c.task = t
c.node = node
if t.Spec.GetContainer() != nil {
preparedSpec, err := template.ExpandContainerSpec(node, t)
@@ -225,12 +227,13 @@ func (c *containerConfig) config() *containertypes.Config {
func (c *containerConfig) labels() map[string]string {
var (
system = map[string]string{
"task": "", // mark as cluster task
"task.id": c.task.ID,
"task.name": c.name(),
"node.id": c.task.NodeID,
"service.id": c.task.ServiceID,
"service.name": c.task.ServiceAnnotations.Name,
"task": "", // mark as cluster task
"task.id": c.task.ID,
"task.name": c.name(),
"node.id": c.task.NodeID,
"node.hostname": c.node.Hostname,
"service.id": c.task.ServiceID,
"service.name": c.task.ServiceAnnotations.Name,
}
labels = make(map[string]string)
)

33
daemon/cluster/executor/container/container_test.go
View File

@@ -49,13 +49,14 @@ func TestContainerLabels(t *testing.T) {
Runtime: &swarmapi.TaskSpec_Container{
Container: &swarmapi.ContainerSpec{
Labels: map[string]string{
"com.docker.swarm.task": "user-specified-task",
"com.docker.swarm.task.id": "user-specified-task.id",
"com.docker.swarm.task.name": "user-specified-task.name",
"com.docker.swarm.node.id": "user-specified-node.id",
"com.docker.swarm.service.id": "user-specified-service.id",
"com.docker.swarm.service.name": "user-specified-service.name",
"this-is-a-user-label": "this is a user label's value",
"com.docker.swarm.task": "user-specified-task",
"com.docker.swarm.task.id": "user-specified-task.id",
"com.docker.swarm.task.name": "user-specified-task.name",
"com.docker.swarm.node.id": "user-specified-node.id",
"com.docker.swarm.node.hostname": "user-specified-node.hostname",
"com.docker.swarm.service.id": "user-specified-service.id",
"com.docker.swarm.service.name": "user-specified-service.name",
"this-is-a-user-label": "this is a user label's value",
},
},
},
@@ -70,16 +71,20 @@ func TestContainerLabels(t *testing.T) {
Name: "real-service.name",
},
},
node: &swarmapi.NodeDescription{
Hostname: "real-node.hostname",
},
}
expected := map[string]string{
"com.docker.swarm.task": "",
"com.docker.swarm.task.id": "real-task.id",
"com.docker.swarm.task.name": "real-service.name.123.real-task.id",
"com.docker.swarm.node.id": "real-node.id",
"com.docker.swarm.service.id": "real-service.id",
"com.docker.swarm.service.name": "real-service.name",
"this-is-a-user-label": "this is a user label's value",
"com.docker.swarm.task": "",
"com.docker.swarm.task.id": "real-task.id",
"com.docker.swarm.task.name": "real-service.name.123.real-task.id",
"com.docker.swarm.node.id": "real-node.id",
"com.docker.swarm.node.hostname": "real-node.hostname",
"com.docker.swarm.service.id": "real-service.id",
"com.docker.swarm.service.name": "real-service.name",
"this-is-a-user-label": "this is a user label's value",
}
labels := c.labels()