From 4c037e440f1a6c1d2aca12b9afc8e87c465e3d64 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Thu, 16 Apr 2015 13:39:49 -0400 Subject: [PATCH] Don't trigger a build if the namespaces differ --- pkg/build/controller/image_change_controller.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/build/controller/image_change_controller.go b/pkg/build/controller/image_change_controller.go index 691455ce93af..c86b96699661 100644 --- a/pkg/build/controller/image_change_controller.go +++ b/pkg/build/controller/image_change_controller.go @@ -51,11 +51,16 @@ func (c *ImageChangeController) HandleImageRepo(repo *imageapi.ImageStream) erro continue } change := trigger.ImageChange + + changeNamespace := change.From.Namespace + if len(changeNamespace) == 0 { + changeNamespace = config.Namespace + } + // only trigger a build if this image repo matches the name and namespace of the ref in the build trigger // also do not trigger if the imagerepo does not have a valid DockerImageRepository value for us to pull // the image from - if len(repo.Status.DockerImageRepository) == 0 || change.From.Name != repo.Name || - (len(change.From.Namespace) != 0 && change.From.Namespace != repo.Namespace) { + if len(repo.Status.DockerImageRepository) == 0 || change.From.Name != repo.Name || changeNamespace != repo.Namespace { continue } latest, err := imageapi.LatestTaggedImage(repo, change.Tag)