If ForceUserspaceProxy is true, check for iptables based proxy

should not be performed.
pull/6/head
Avesh Agarwal 2015-09-08 19:54:07 -04:00
parent 0f1525ce9b
commit f94c57ac30
1 changed files with 10 additions and 5 deletions

View File

@ -168,12 +168,17 @@ func (s *ProxyServer) Run(_ []string) error {
var proxier proxy.ProxyProvider var proxier proxy.ProxyProvider
var endpointsHandler config.EndpointsConfigHandler var endpointsHandler config.EndpointsConfigHandler
// guaranteed false on error, error only necessary for debugging shouldUseIptables := false
shouldUseIptables, err := iptables.ShouldUseIptablesProxier() if !s.ForceUserspaceProxy {
if err != nil { var err error
glog.Errorf("Can't determine whether to use iptables or userspace, using userspace proxier: %v", err) // 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.") glog.V(2).Info("Using iptables Proxier.")
execer := exec.New() execer := exec.New()