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

proxy/userspace: consolidate portal and proxy cleanup

Browse Source
This commit is contained in:
Dan Williams 2019-03-31 15:30:02 -05:00
parent 8cf0076e23
commit cc2b31a2f3
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/proxy/userspace/proxier.go
View File

@ -461,6 +461,16 @@ func (proxier *Proxier) addServiceOnPortInternal(service proxy.ServicePortName,
return si, nil return si, nil
} }
func (proxier *Proxier) cleanupPortalAndProxy(serviceName proxy.ServicePortName, info *ServiceInfo) error {
if err := proxier.closePortal(serviceName, info); err != nil {
return fmt.Errorf("Failed to close portal for %q: %v", serviceName, err)
}
if err := proxier.stopProxy(serviceName, info); err != nil {
return fmt.Errorf("Failed to stop service %q: %v", serviceName, err)
}
return nil
}
func (proxier *Proxier) mergeService(service *v1.Service) sets.String { func (proxier *Proxier) mergeService(service *v1.Service) sets.String {
if service == nil { if service == nil {
return nil return nil
@ -483,11 +493,8 @@ func (proxier *Proxier) mergeService(service *v1.Service) sets.String {
} }
if exists { if exists {
klog.V(4).Infof("Something changed for service %q: stopping it", serviceName) klog.V(4).Infof("Something changed for service %q: stopping it", serviceName)
if err := proxier.closePortal(serviceName, info); err != nil { if err := proxier.cleanupPortalAndProxy(serviceName, info); err != nil {
klog.Errorf("Failed to close portal for %q: %v", serviceName, err) klog.Error(err)
}
if err := proxier.stopProxy(serviceName, info); err != nil {
klog.Errorf("Failed to stop service %q: %v", serviceName, err)
} }
} }
proxyPort, err := proxier.proxyPorts.AllocateNext() proxyPort, err := proxier.proxyPorts.AllocateNext()
@ -554,11 +561,8 @@ func (proxier *Proxier) unmergeService(service *v1.Service, existingPorts sets.S
staleUDPServices.Insert(proxier.serviceMap[serviceName].portal.ip.String()) staleUDPServices.Insert(proxier.serviceMap[serviceName].portal.ip.String())
} }
if err := proxier.closePortal(serviceName, info); err != nil { if err := proxier.cleanupPortalAndProxy(serviceName, info); err != nil {
klog.Errorf("Failed to close portal for %q: %v", serviceName, err) klog.Error(err)
}
if err := proxier.stopProxy(serviceName, info); err != nil {
klog.Errorf("Failed to stop service %q: %v", serviceName, err)
} }
proxier.loadBalancer.DeleteService(serviceName) proxier.loadBalancer.DeleteService(serviceName)
} }