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

Merge pull request #27748 from mfanjie/service-controller

Browse Source 
Automatic merge from submit-queue

Federation: Improve the handling of service deletion in underlying clusters

fixes #27623 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-22 16:21:16 -07:00 committed by GitHub
commit c5afca10f4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
federation/pkg/federation-controller/service/service_helper.go
View File

@ -69,7 +69,7 @@ func (cc *clusterClientCache) syncService(key, clusterName string, clusterCache
clusterCache.serviceQueue.Add(key) clusterCache.serviceQueue.Add(key)
return err return err
} }
var needUpdate bool var needUpdate, isDeletion bool
if exists { if exists {
service, ok := serviceInterface.(*v1.Service) service, ok := serviceInterface.(*v1.Service)
if ok { if ok {
@ -82,10 +82,12 @@ func (cc *clusterClientCache) syncService(key, clusterName string, clusterCache
} }
glog.Infof("Found tombstone for %v", key) glog.Infof("Found tombstone for %v", key)
needUpdate = cc.processServiceDeletion(cachedService, clusterName) needUpdate = cc.processServiceDeletion(cachedService, clusterName)
isDeletion = true
} }
} else { } else {
glog.Infof("Can not get service %v for cluster %s from serviceStore", key, clusterName) glog.Infof("Can not get service %v for cluster %s from serviceStore", key, clusterName)
needUpdate = cc.processServiceDeletion(cachedService, clusterName) needUpdate = cc.processServiceDeletion(cachedService, clusterName)
isDeletion = true
} }
if needUpdate { if needUpdate {
@ -110,6 +112,15 @@ func (cc *clusterClientCache) syncService(key, clusterName string, clusterCache
} }
} }
} }
if isDeletion {
// cachedService is not reliable here as
// deleting cache is the last step of federation service deletion
_, err := fedClient.Core().Services(cachedService.lastState.Namespace).Get(cachedService.lastState.Name)
// rebuild service if federation service still exists
if err == nil || !errors.IsNotFound(err) {
return sc.ensureClusterService(cachedService, clusterName, cachedService.appliedState, clusterCache.clientset)
}
}
return nil return nil
} }