github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 13:14:05 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: Replace GetKubeletDockerContainers with GetPods in syncPod/SyncPods.

Browse Source
This commit is contained in:
Yifan Gu
2015-03-20 14:20:01 -07:00
parent eec6456f51
commit 13250c904f
7 changed files with 121 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/dockertools/docker.go
View File

@@ -839,31 +839,31 @@ func GetPods(client DockerInterface, all bool) ([]*container.Pod, error) {
// Group containers by pod.
for _, c := range containers {
if len(c.Names) == 0 {
glog.Warningf("Cannog parse empty docker container name: %#v", c.Names)
glog.Warningf("Cannot parse empty docker container name: %#v", c.Names)
continue
}
podFullName, podUID, containerName, hash, err := ParseDockerName(c.Names[0])
dockerName, hash, err := ParseDockerName(c.Names[0])
if err != nil {
glog.Warningf("Parse docker container name %q error: %v", c.Names[0], err)
continue
}
pod, found := pods[podUID]
pod, found := pods[dockerName.PodUID]
if !found {
name, namespace, err := parsePodFullName(podFullName)
name, namespace, err := parsePodFullName(dockerName.PodFullName)
if err != nil {
glog.Warningf("Parse pod full name %q error: %v", podFullName, err)
glog.Warningf("Parse pod full name %q error: %v", dockerName.PodFullName, err)
continue
}
pod = &container.Pod{
ID: podUID,
ID: dockerName.PodUID,
Name: name,
Namespace: namespace,
}
pods[podUID] = pod
pods[dockerName.PodUID] = pod
}
pod.Containers = append(pod.Containers, &container.Container{
ID: types.UID(c.ID),
Name: containerName,
Name: dockerName.ContainerName,
Hash: hash,
Created: c.Created,
})