github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80942 from gongguan/fix_ipvs_svc_del

Browse Source 
fix ipvs_svc deletion
This commit is contained in:
Kubernetes Prow Robot
2019-08-13 02:27:54 -07:00
committed by GitHub
parent b680c7c898 97c4edaa4f
commit 12a085f917
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/proxy/ipvs/proxier.go
View File

@@ -1771,25 +1771,6 @@ func (proxier *Proxier) cleanLegacyService(activeServices map[string]bool, curre
continue continue
} }
if _, ok := activeServices[cs]; !ok { if _, ok := activeServices[cs]; !ok {
rsList, _ := proxier.ipvs.GetRealServers(svc)
// If we still have real servers graceful termination is not done
if len(rsList) > 0 {
continue
}
// Applying graceful termination to all real servers
for _, rs := range rsList {
uniqueRS := GetUniqueRSName(svc, rs)
// If RS is already in the graceful termination list, no need to add it again
if proxier.gracefuldeleteManager.InTerminationList(uniqueRS) {
continue
}
klog.V(5).Infof("Using graceful delete to delete: %v", uniqueRS)
if err := proxier.gracefuldeleteManager.GracefulDeleteRS(svc, rs); err != nil {
klog.Errorf("Failed to delete destination: %v, error: %v", uniqueRS, err)
}
}
klog.V(4).Infof("Delete service %s", svc.String()) klog.V(4).Infof("Delete service %s", svc.String())
if err := proxier.ipvs.DeleteVirtualServer(svc); err != nil { if err := proxier.ipvs.DeleteVirtualServer(svc); err != nil {
klog.Errorf("Failed to delete service %s, error: %v", svc.String(), err) klog.Errorf("Failed to delete service %s, error: %v", svc.String(), err)