Use the router's image instead of guessing in tests

Also use a consistent prefix so we get good debug output

Author: smarterclayton

pkg/router/controller/factory/factory.go

@@ -236,7 +236,7 @@ func (f *RouterControllerFactory) CreateRoutesSharedInformer() kcache.SharedInde
 				return nil, err
 			}
 			if f.RouteModifierFn != nil {
-				watch.Filter(w, func(in watch.Event) (watch.Event, bool) {
+				w = watch.Filter(w, func(in watch.Event) (watch.Event, bool) {
 					if route, ok := in.Object.(*routeapi.Route); ok {
 						f.RouteModifierFn(route)
 					}

test/extended/router/scoped.go

@@ -39,20 +39,28 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 			if routes, _ := client.List(metav1.ListOptions{}); routes != nil {
 				outputIngress(routes.Items...)
 			}
-			exutil.DumpPodLogsStartingWith("scoped-router", oc)
+			exutil.DumpPodLogsStartingWith("router-", oc)
 		}
 	})
 
-	oc = exutil.NewCLI("scoped-router", exutil.KubeConfigPath())
+	oc = exutil.NewCLI("router-scoped", exutil.KubeConfigPath())
 
 	g.BeforeEach(func() {
 		ns = oc.Namespace()
 
-		imagePrefix := os.Getenv("OS_IMAGE_PREFIX")
-		if len(imagePrefix) == 0 {
-			imagePrefix = "openshift/origin"
+		image := os.Getenv("OS_IMAGE_PREFIX")
+		if len(image) == 0 {
+			image = "openshift/origin"
 		}
-		err := oc.AsAdmin().Run("new-app").Args("-f", configPath, "-p", "IMAGE="+imagePrefix+"-haproxy-router").Execute()
+		image += "-haproxy-router"
+
+		if dc, err := oc.AdminAppsClient().Apps().DeploymentConfigs("default").Get("router", metav1.GetOptions{}); err == nil {
+			if len(dc.Spec.Template.Spec.Containers) > 0 && dc.Spec.Template.Spec.Containers[0].Image != "" {
+				image = dc.Spec.Template.Spec.Containers[0].Image
+			}
+		}
+
+		err := oc.AsAdmin().Run("new-app").Args("-f", configPath, "-p", "IMAGE="+image).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 
@@ -67,7 +75,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 
 			var routerIP string
 			err := wait.Poll(time.Second, changeTimeoutSeconds*time.Second, func() (bool, error) {
-				pod, err := oc.KubeFramework().ClientSet.CoreV1().Pods(oc.KubeFramework().Namespace.Name).Get("scoped-router", metav1.GetOptions{})
+				pod, err := oc.KubeFramework().ClientSet.CoreV1().Pods(oc.KubeFramework().Namespace.Name).Get("router-scoped", metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}

test/extended/router/unprivileged.go

@@ -63,7 +63,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 
 			var routerIP string
 			err := wait.Poll(time.Second, changeTimeoutSeconds*time.Second, func() (bool, error) {
-				pod, err := oc.KubeFramework().ClientSet.CoreV1().Pods(oc.KubeFramework().Namespace.Name).Get("scoped-router", metav1.GetOptions{})
+				pod, err := oc.KubeFramework().ClientSet.CoreV1().Pods(oc.KubeFramework().Namespace.Name).Get("router-scoped", metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}

test/extended/testdata/bindata.go

@@ -10,9 +10,9 @@ objects:
 - apiVersion: v1
   kind: Pod
   metadata:
-    name: scoped-router
+    name: router-scoped
     labels:
-      test: scoped-router
+      test: router-scoped
   spec:
     terminationGracePeriodSeconds: 1
     containers: