From f94c57ac303f40f83a93b6aeb003ccfedf40043c Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Tue, 8 Sep 2015 19:54:07 -0400 Subject: [PATCH] If ForceUserspaceProxy is true, check for iptables based proxy should not be performed. --- cmd/kube-proxy/app/server.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index c0d573493a0..b5334d6a9cf 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -168,12 +168,17 @@ func (s *ProxyServer) Run(_ []string) error { var proxier proxy.ProxyProvider var endpointsHandler config.EndpointsConfigHandler - // guaranteed false on error, error only necessary for debugging - shouldUseIptables, err := iptables.ShouldUseIptablesProxier() - if err != nil { - glog.Errorf("Can't determine whether to use iptables or userspace, using userspace proxier: %v", err) + shouldUseIptables := false + if !s.ForceUserspaceProxy { + var err error + // guaranteed false on error, error only necessary for debugging + shouldUseIptables, err = iptables.ShouldUseIptablesProxier() + if err != nil { + glog.Errorf("Can't determine whether to use iptables proxy, using userspace proxier: %v", err) + } } - if !s.ForceUserspaceProxy && shouldUseIptables { + + if shouldUseIptables { glog.V(2).Info("Using iptables Proxier.") execer := exec.New()