Merge pull request #20579 from ramr/namespace-label-fix

Fix issue where routes are not cleaned up when a namespace label is deleted or updated.

Author: openshift-merge-robot

pkg/router/controller/router_controller.go

@@ -132,7 +132,11 @@ func (c *RouterController) processNamespace(eventType watch.EventType, ns *kapi.
 }
 
 func (c *RouterController) UpdateNamespaces() {
-	namespaces := c.FilteredNamespaceNames
+	// Note: Need to clone the filtered namespace names or else any updates
+	//       we make locally in processNamespace() will be immediately
+	//       reflected to plugins in the chain beneath us. This creates
+	//       cleanup issues as old == new in Plugin.HandleNamespaces().
+	namespaces := sets.NewString(c.FilteredNamespaceNames.List()...)
 
 	glog.V(4).Infof("Updating watched namespaces: %v", namespaces)
 	if err := c.Plugin.HandleNamespaces(namespaces); err != nil {

pkg/router/template/router.go

@@ -351,8 +351,8 @@ func (r *templateRouter) commitAndReload() error {
 		}
 
 		r.stateChanged = false
-		r.dynamicallyConfigured = true
 		if r.dynamicConfigManager != nil {
+			r.dynamicallyConfigured = true
 			r.dynamicConfigManager.Notify(RouterEventReloadStart)
 		}
 
@@ -510,6 +510,10 @@ func (r *templateRouter) FilterNamespaces(namespaces sets.String) {
 		delete(r.state, k)
 		r.stateChanged = true
 	}
+
+	if r.stateChanged {
+		r.dynamicallyConfigured = false
+	}
 }
 
 // CreateServiceUnit creates a new service named with the given id.