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

Merge pull request #3183 from weaveworks/k10-fix

Browse Source 
Fix pause image detection for Kubernetes 1.10
This commit is contained in:
Stefan Prodan
2018-05-19 15:43:23 +03:00
committed by GitHub
parent 5e700d996b 439b67880e
commit bbf83e147e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
probe/kubernetes/reporter.go
View File

@@ -183,8 +183,8 @@ 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")
return strings.Contains(imageName, "google_containers/pause") ||
strings.Contains(imageName, "k8s.gcr.io/pause")
}
func isPauseContainer(n report.Node, rpt report.Report) bool {