Merge pull request kubernetes#30874 from mwielgus/ret-nc

Automatic merge from submit-queue Federated namespace controller - stop reconcilation if not in sync cc: @quinton-hoole @kubernetes/sig-cluster-federation
lavalamp · Aug 18, 2016 · 7c1d59b · 7c1d59b
2 parents 6659d80 + 420bab4
commit 7c1d59b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go
@@ -221,6 +221,7 @@ func (nc *NamespaceController) reconcileNamespacesOnClusterChange() {
 func (nc *NamespaceController) reconcileNamespace(namespace string) {
 	if !nc.isSynced() {
 		nc.deliverNamespace(namespace, nc.clusterAvailableDelay, false)
+		return
 	}
 
 	baseNamespaceObj, exist, err := nc.namespaceInformerStore.GetByKey(namespace)