Merge pull request #20630 from ramr/router-blueprints-fix

openshift-merge-robot · web-flow · commit c9f30d1d14db · 2018-08-14T22:40:54.000-07:00
router dynamic config manager fix to use the cloned blueprint
diff --git a/pkg/router/template/configmanager/haproxy/manager.go b/pkg/router/template/configmanager/haproxy/manager.go
@@ -214,15 +214,15 @@ func (cm *haproxyConfigManager) AddBlueprint(route *routeapi.Route) {
 			newRoute.Spec.Host = r.Spec.Host
 			if !reflect.DeepEqual(r, newRoute) {
 				updated = true
-				blueprints = append(blueprints, route.DeepCopy())
+				blueprints = append(blueprints, newRoute)
 				continue
 			}
 		}
 		blueprints = append(blueprints, r)
 	}
 
 	if !routeExists {
-		blueprints = append(blueprints, route.DeepCopy())
+		blueprints = append(blueprints, newRoute)
 		updated = true
 	}
 
@@ -234,7 +234,7 @@ func (cm *haproxyConfigManager) AddBlueprint(route *routeapi.Route) {
 	cm.blueprintRoutes = blueprints
 	cm.lock.Unlock()
 
-	cm.provisionRoutePool(route)
+	cm.provisionRoutePool(newRoute)
 }
 
 // RemoveBlueprint removes a route blueprint.
@@ -264,7 +264,7 @@ func (cm *haproxyConfigManager) RemoveBlueprint(route *routeapi.Route) {
 	cm.blueprintRoutes = blueprints
 	cm.lock.Unlock()
 
-	cm.removeRoutePool(route)
+	cm.removeRoutePool(deletedRoute)
 }
 
 // Register registers an id with an expected haproxy backend for a route.

Original file line number	Diff line number	Diff line change
`@@ -214,15 +214,15 @@ func (cm haproxyConfigManager) AddBlueprint(route routeapi.Route) {`
`214`	`214`	`newRoute.Spec.Host = r.Spec.Host`
`215`	`215`	`if !reflect.DeepEqual(r, newRoute) {`
`216`	`216`	`updated = true`
`217`		`- blueprints = append(blueprints, route.DeepCopy())`
	`217`	`+ blueprints = append(blueprints, newRoute)`
`218`	`218`	`continue`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`blueprints = append(blueprints, r)`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`if !routeExists {`
`225`		`- blueprints = append(blueprints, route.DeepCopy())`
	`225`	`+ blueprints = append(blueprints, newRoute)`
`226`	`226`	`updated = true`
`227`	`227`	`}`
`228`	`228`
`@@ -234,7 +234,7 @@ func (cm haproxyConfigManager) AddBlueprint(route routeapi.Route) {`
`234`	`234`	`cm.blueprintRoutes = blueprints`
`235`	`235`	`cm.lock.Unlock()`
`236`	`236`
`237`		`- cm.provisionRoutePool(route)`
	`237`	`+ cm.provisionRoutePool(newRoute)`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`// RemoveBlueprint removes a route blueprint.`
`@@ -264,7 +264,7 @@ func (cm haproxyConfigManager) RemoveBlueprint(route routeapi.Route) {`
`264`	`264`	`cm.blueprintRoutes = blueprints`
`265`	`265`	`cm.lock.Unlock()`
`266`	`266`
`267`		`- cm.removeRoutePool(route)`
	`267`	`+ cm.removeRoutePool(deletedRoute)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`// Register registers an id with an expected haproxy backend for a route.`