From 9e59a3eacea4b3e1f4dd83b88a607d1d95ca9dbc Mon Sep 17 00:00:00 2001 From: pidster Date: Wed, 20 Apr 2016 11:59:23 +0100 Subject: [PATCH 1/3] Add swarm-agent, swarm-agent master to sys container filters --- render/filters.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/render/filters.go b/render/filters.go index 61839292f..e510d76a3 100644 --- a/render/filters.go +++ b/render/filters.go @@ -250,12 +250,14 @@ func FilterApplication(r Renderer) Renderer { } var systemContainerNames = map[string]struct{}{ - "weavescope": {}, - "weavedns": {}, - "weave": {}, - "weaveproxy": {}, - "weaveexec": {}, - "ecs-agent": {}, + "weavescope": {}, + "weavedns": {}, + "weave": {}, + "weaveproxy": {}, + "weaveexec": {}, + "ecs-agent": {}, + "swarm-agent" {}, + "swarm-agent-master" {}, } var systemImagePrefixes = map[string]struct{}{ From 6b5e39ff022afb7d4e7ffe9c2b0143b4c731eb32 Mon Sep 17 00:00:00 2001 From: pidster Date: Thu, 21 Apr 2016 16:52:13 +0100 Subject: [PATCH 2/3] Address feedback in PR. Move to images, etc. Also fixes embarrassing compilation error; reminding me not to rewrite patches *after* testing, without re-testing. --- render/filters.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/render/filters.go b/render/filters.go index e510d76a3..7cabda72e 100644 --- a/render/filters.go +++ b/render/filters.go @@ -250,17 +250,16 @@ func FilterApplication(r Renderer) Renderer { } var systemContainerNames = map[string]struct{}{ - "weavescope": {}, - "weavedns": {}, - "weave": {}, - "weaveproxy": {}, - "weaveexec": {}, - "ecs-agent": {}, - "swarm-agent" {}, - "swarm-agent-master" {}, + "weavescope": {}, + "weavedns": {}, + "weave": {}, + "weaveproxy": {}, + "weaveexec": {}, + "ecs-agent": {}, } var systemImagePrefixes = map[string]struct{}{ + "/swarm": {}, "weaveworks/scope": {}, "weaveworks/weavedns": {}, "weaveworks/weave": {}, From 0c2e9347d029afe3c817dfd9b44436752942be01 Mon Sep 17 00:00:00 2001 From: pidster Date: Mon, 25 Apr 2016 14:54:09 +0100 Subject: [PATCH 3/3] remove prefix slash --- render/filters.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render/filters.go b/render/filters.go index 7cabda72e..9be24ede4 100644 --- a/render/filters.go +++ b/render/filters.go @@ -259,7 +259,7 @@ var systemContainerNames = map[string]struct{}{ } var systemImagePrefixes = map[string]struct{}{ - "/swarm": {}, + "swarm": {}, "weaveworks/scope": {}, "weaveworks/weavedns": {}, "weaveworks/weave": {},