Skip to content

K
k3s
Commit cf7225f5 authored by Dan Williams's avatar Dan Williams
Browse files
Options

proxy/userspace: replace IsServiceIPSet() with ShouldSkipService()

Keeps things consistent with iptables/IPVS proxies. Proxies don't handle ServiceTypeExternalName even if the ClusterIP is set.
parent 04b943ce
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/proxy/userspace/proxier.go
View file @ cf7225f5
...@@ -435,7 +435,7 @@ func (proxier *Proxier) mergeService(service *v1.Service) sets.String { ...@@ -435,7 +435,7 @@ func (proxier *Proxier) mergeService(service *v1.Service) sets.String {
return nil return nil
} }
svcName := types.NamespacedName{Namespace: service.Namespace, Name: service.Name} svcName := types.NamespacedName{Namespace: service.Namespace, Name: service.Name}
if !helper.IsServiceIPSet(service) { if utilproxy.ShouldSkipService(svcName, service) {
klog.V(3).Infof("Skipping service %s due to clusterIP = %q", svcName, service.Spec.ClusterIP) klog.V(3).Infof("Skipping service %s due to clusterIP = %q", svcName, service.Spec.ClusterIP)
return nil return nil
} }
...@@ -500,7 +500,7 @@ func (proxier *Proxier) unmergeService(service *v1.Service, existingPorts sets.S ...@@ -500,7 +500,7 @@ func (proxier *Proxier) unmergeService(service *v1.Service, existingPorts sets.S
return return
} }
svcName := types.NamespacedName{Namespace: service.Namespace, Name: service.Name} svcName := types.NamespacedName{Namespace: service.Namespace, Name: service.Name}
if !helper.IsServiceIPSet(service) { if utilproxy.ShouldSkipService(svcName, service) {
klog.V(3).Infof("Skipping service %s due to clusterIP = %q", svcName, service.Spec.ClusterIP) klog.V(3).Infof("Skipping service %s due to clusterIP = %q", svcName, service.Spec.ClusterIP)
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment