github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1770 from weaveworks/1750-extend-k8s-pause-containers

Browse Source 
Identify kubernetes pause containers more broadly
This commit is contained in:
Alfonso Acosta
2016-08-09 11:26:07 +01:00
committed by GitHub
parent c40a1b0c3d b64686ffc3
commit d06547e596
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
probe/kubernetes/reporter.go
View File

@@ -142,6 +142,13 @@ func (r *Reporter) podEvent(e Event, pod Pod) {
}
}
// IsPauseImageName indicates whether an image name corresponds to a
// kubernetes pause container image.
func IsPauseImageName(imageName string) bool {
return strings.Contains(imageName, "google_containers/pause")
}
func isPauseContainer(n report.Node, rpt report.Report) bool {
containerImageIDs, ok := n.Parents.Lookup(report.ContainerImage)
if !ok {
@@ -156,9 +163,7 @@ func isPauseContainer(n report.Node, rpt report.Report) bool {
if !ok {
continue
}
if docker.ImageNameWithoutVersion(imageName) == "google_containers/pause" {
return true
}
return IsPauseImageName(imageName)
}
return false
}

22
render/filters.go
View File

@@ -219,7 +219,7 @@ func IsApplication(n report.Node) bool {
}
imageName, _ := n.Latest.Lookup(docker.ImageName)
imagePrefix := strings.SplitN(imageName, ":", 2)[0] // :(
if _, ok := systemImagePrefixes[imagePrefix]; ok {
if _, ok := systemImagePrefixes[imagePrefix]; ok || kubernetes.IsPauseImageName(imagePrefix) {
return false
}
roleLabel, _ := n.Latest.Lookup(docker.LabelPrefix + "works.weave.role")
@@ -268,15 +268,13 @@ var systemContainerNames = map[string]struct{}{
}
var systemImagePrefixes = map[string]struct{}{
"swarm": {},
"weaveworks/scope": {},
"weaveworks/weavedns": {},
"weaveworks/weave": {},
"weaveworks/weaveproxy": {},
"weaveworks/weaveexec": {},
"amazon/amazon-ecs-agent": {},
"beta.gcr.io/google_containers/pause": {},
"gcr.io/google_containers/pause": {},
"openshift/origin-pod": {},
"docker.io/openshift/origin-pod": {},
"swarm": {},
"weaveworks/scope": {},
"weaveworks/weavedns": {},
"weaveworks/weave": {},
"weaveworks/weaveproxy": {},
"weaveworks/weaveexec": {},
"amazon/amazon-ecs-agent": {},
"openshift/origin-pod": {},
"docker.io/openshift/origin-pod": {},
}