github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7712 from rjnagal/kubelet

Browse Source 
Expose pod name as a label on containers.
This commit is contained in:
Victor Marmol 2015-05-04 14:52:16 -07:00
commit b0129089da
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/dockertools/manager.go
View File

@ -503,6 +503,10 @@ func (dm *DockerManager) runContainer(pod *api.Pod, container *api.Container, op
if len(containerHostname) > hostnameMaxLen {
containerHostname = containerHostname[:hostnameMaxLen]
}
namespacedName := types.NamespacedName{pod.Namespace, pod.Name}
labels := map[string]string{
"io.kubernetes.pod.name": namespacedName.String(),
}
dockerOpts := docker.CreateContainerOptions{
Name: BuildDockerName(dockerName, container),
Config: &docker.Config{
@ -513,6 +517,7 @@ func (dm *DockerManager) runContainer(pod *api.Pod, container *api.Container, op
Memory: container.Resources.Limits.Memory().Value(),
CPUShares: milliCPUToShares(container.Resources.Limits.Cpu().MilliValue()),
WorkingDir: container.WorkingDir,
Labels: labels,
},
}