From 08b44291165ffc5ebcf0844b70f353a94dfb7e20 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 23 Jan 2019 17:50:22 +0200 Subject: [PATCH] Refactor filterImages as per Michael comments --- cluster/kubernetes/images.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/kubernetes/images.go b/cluster/kubernetes/images.go index 58be01637..62c9ea33d 100644 --- a/cluster/kubernetes/images.go +++ b/cluster/kubernetes/images.go @@ -144,8 +144,8 @@ func (c *Cluster) ImagesToFetch() registry.ImageCreds { // filterImages returns an image list from a pod spec // by removing those matching the exclusion list -func (c *Cluster) filterImages(podTemplate apiv1.PodTemplateSpec) []image.Name { - images := []image.Name{} +func (c *Cluster) filterImages(podTemplate apiv1.PodTemplateSpec, imageExcludeList []string) []image.Name { + var images []image.Name for _, container := range podTemplate.Spec.InitContainers { r, err := image.ParseRef(container.Image) @@ -177,12 +177,11 @@ func (c *Cluster) filterImages(podTemplate apiv1.PodTemplateSpec) []image.Name { for _, exp := range c.imageExcludeList { if glob.Glob(exp, imageName) { include = false + break } } if include { result = append(result, imageID) - } else { - //c.logger.Log("debug", fmt.Sprintf("image %s excluded", imageName)) } }