github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30874 from mwielgus/ret-nc

Browse Source 
Automatic merge from submit-queue

Federated namespace controller - stop reconcilation if not in sync

cc: @quinton-hoole @kubernetes/sig-cluster-federation
This commit is contained in:
Kubernetes Submit Queue 2016-08-18 08:31:03 -07:00 committed by GitHub
commit 7c1d59bbf4
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/pkg/federation-controller/namespace/namespace_controller.go
View File

@ -221,6 +221,7 @@ func (nc *NamespaceController) reconcileNamespacesOnClusterChange() {
func (nc *NamespaceController) reconcileNamespace(namespace string) { func (nc *NamespaceController) reconcileNamespace(namespace string) {
if !nc.isSynced() { if !nc.isSynced() {
nc.deliverNamespace(namespace, nc.clusterAvailableDelay, false) nc.deliverNamespace(namespace, nc.clusterAvailableDelay, false)
return
} }
baseNamespaceObj, exist, err := nc.namespaceInformerStore.GetByKey(namespace) baseNamespaceObj, exist, err := nc.namespaceInformerStore.GetByKey(namespace)