fix DCM tests

Some fixes to the DCM e2e test.

* fix secret name used on the secure endpoint pod
* manually update Route resources created via oc expose service, since
it seems to be ignoring --labels command-line option.

Jira: https://issues.redhat.com/browse/NE-906

Author: jcmoraisjr

test/extended/router/config_manager.go

@@ -49,9 +49,6 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:route.openshift.io]",
 	oc = exutil.NewCLI("router-config-manager")
 
 	g.BeforeEach(func() {
-		// the test has been skipped since July 2018 because it was flaking.
-		// TODO: Fix the test and re-enable it in https://issues.redhat.com/browse/NE-906.
-		g.Skip("HAProxy dynamic config manager tests skipped in 4.x")
 		ns = oc.Namespace()
 
 		routerImage, err := exutil.FindRouterImage(oc)
@@ -462,7 +459,7 @@ http {
 							Name: "cert",
 							VolumeSource: corev1.VolumeSource{
 								Secret: &corev1.SecretVolumeSource{
-									SecretName: "service-cert",
+									SecretName: "serving-cert",
 								},
 							},
 						},
@@ -491,9 +488,6 @@ http {
 
 	g.Describe("The HAProxy router", func() {
 		g.It("should serve the correct routes when running with the haproxy config manager", func() {
-			// the test has been skipped since July 2018 because it was flaking.
-			// TODO: Fix the test and re-enable it in https://issues.redhat.com/browse/NE-906.
-			g.Skip("HAProxy dynamic config manager tests skipped in 4.x")
 			ns := oc.KubeFramework().Namespace.Name
 			execPod := exutil.CreateExecPodOrFail(oc.AdminKubeClient(), ns, "execpod")
 			defer func() {
@@ -532,7 +526,10 @@ http {
 			for i := 0; i < 16; i++ {
 				name := fmt.Sprintf("hapcm-stress-insecure-%d", i)
 				hostName := fmt.Sprintf("stress.insecure-%d.hapcm.test", i)
-				err := oc.AsAdmin().Run("expose").Args("service", "insecure-service", "--name", name, "--hostname", hostName, "--labels", "select=haproxy-cfgmgr").Execute()
+				err := oc.AsAdmin().Run("expose").Args("service", "insecure-service", "--name", name, "--hostname", hostName).Execute()
+				o.Expect(err).NotTo(o.HaveOccurred())
+				// --labels on `oc expose` (above) does not override the ones coming from service's selector.
+				err = oc.AsAdmin().Run("label").Args("route", name, "select=haproxy-cfgmgr").Execute()
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				err = waitForRouteToRespond(ns, execPod.Name, "http", hostName, "/", routerIP, 0)