Merge pull request #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

Merge pull request #30874 from mwielgus/ret-nc
7c1d59bb · Kubernetes Submit Queue · GitHub · 6659d809 · 420bab47 · 7c1d59bb
Commit 7c1d59bb authored Aug 18, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

namespace_controller.go ...g/federation-controller/namespace/namespace_controller.go +1 -0

No files found.
--- 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)