From cf7225f56180a0e44922f59e870c4378f2f72d59 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 31 Mar 2019 15:20:29 -0500 Subject: [PATCH] proxy/userspace: replace IsServiceIPSet() with ShouldSkipService() Keeps things consistent with iptables/IPVS proxies. Proxies don't handle ServiceTypeExternalName even if the ClusterIP is set. --- pkg/proxy/userspace/proxier.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go index d50cd31a6c..698ae65a9b 100644 --- a/pkg/proxy/userspace/proxier.go +++ b/pkg/proxy/userspace/proxier.go @@ -435,7 +435,7 @@ func (proxier *Proxier) mergeService(service *v1.Service) sets.String { return nil } 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) return nil } @@ -500,7 +500,7 @@ func (proxier *Proxier) unmergeService(service *v1.Service, existingPorts sets.S return } 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) return }