github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109227 from Monokaix/refactor-pleg/getContainersFromPods

Browse Source 
refactor: pleg/getContainersFromPods
This commit is contained in:
Kubernetes Prow Robot 2022-06-28 10:17:58 -07:00 committed by GitHub
commit 50b982edab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubelet/pleg/generic.go
View File

@ -325,29 +325,25 @@ func (g *GenericPLEG) relist() {
func getContainersFromPods(pods ...*kubecontainer.Pod) []*kubecontainer.Container { func getContainersFromPods(pods ...*kubecontainer.Pod) []*kubecontainer.Container {
cidSet := sets.NewString() cidSet := sets.NewString()
var containers []*kubecontainer.Container var containers []*kubecontainer.Container
fillCidSet := func(cs []*kubecontainer.Container) {
for _, c := range cs {
cid := c.ID.ID
if cidSet.Has(cid) {
continue
}
cidSet.Insert(cid)
containers = append(containers, c)
}
}
for _, p := range pods { for _, p := range pods {
if p == nil { if p == nil {
continue continue
} }
for _, c := range p.Containers { fillCidSet(p.Containers)
cid := string(c.ID.ID)
if cidSet.Has(cid) {
continue
}
cidSet.Insert(cid)
containers = append(containers, c)
}
// Update sandboxes as containers // Update sandboxes as containers
// TODO: keep track of sandboxes explicitly. // TODO: keep track of sandboxes explicitly.
for _, c := range p.Sandboxes { fillCidSet(p.Sandboxes)
cid := string(c.ID.ID)
if cidSet.Has(cid) {
continue
}
cidSet.Insert(cid)
containers = append(containers, c)
}
} }
return containers return containers
} }