github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13670 from aveshagarwal/proxy-fixes

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-09 09:55:52 -07:00
commit 3879bee562
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/kube-proxy/app/server.go
View File

@ -165,12 +165,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()