Skip to content

K
k3s
Commit 6319f8a5 authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Merge pull request #5400 from sub-mod/proxy_test

fix proxy_test.go file to avoid ChooseHostInterface
parents 52bf7af7 269ad321
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
pkg/proxy/proxier.go
View file @ 6319f8a5
...@@ -325,6 +325,10 @@ func NewProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables.In ...@@ -325,6 +325,10 @@ func NewProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables.In
return nil return nil
} }
glog.Infof("Setting Proxy IP to %v", hostIP) glog.Infof("Setting Proxy IP to %v", hostIP)
return CreateProxier(loadBalancer, listenIP, iptables, hostIP)
}
func CreateProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables.Interface, hostIP net.IP) *Proxier {
glog.Infof("Initializing iptables") glog.Infof("Initializing iptables")
// Clean up old messes. Ignore erors. // Clean up old messes. Ignore erors.
iptablesDeleteOld(iptables) iptablesDeleteOld(iptables)
......
pkg/proxy/proxier_test.go
View file @ 6319f8a5
...@@ -201,7 +201,7 @@ func TestTCPProxy(t *testing.T) { ...@@ -201,7 +201,7 @@ func TestTCPProxy(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second)
...@@ -221,7 +221,7 @@ func TestUDPProxy(t *testing.T) { ...@@ -221,7 +221,7 @@ func TestUDPProxy(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second)
...@@ -250,7 +250,7 @@ func TestTCPProxyStop(t *testing.T) { ...@@ -250,7 +250,7 @@ func TestTCPProxyStop(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second)
...@@ -281,7 +281,7 @@ func TestUDPProxyStop(t *testing.T) { ...@@ -281,7 +281,7 @@ func TestUDPProxyStop(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second)
...@@ -312,7 +312,7 @@ func TestTCPProxyUpdateDelete(t *testing.T) { ...@@ -312,7 +312,7 @@ func TestTCPProxyUpdateDelete(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second)
...@@ -342,7 +342,7 @@ func TestUDPProxyUpdateDelete(t *testing.T) { ...@@ -342,7 +342,7 @@ func TestUDPProxyUpdateDelete(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second)
...@@ -372,7 +372,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) { ...@@ -372,7 +372,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second)
...@@ -411,7 +411,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) { ...@@ -411,7 +411,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second)
...@@ -450,7 +450,7 @@ func TestTCPProxyUpdatePort(t *testing.T) { ...@@ -450,7 +450,7 @@ func TestTCPProxyUpdatePort(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "TCP", 0, time.Second)
...@@ -486,7 +486,7 @@ func TestUDPProxyUpdatePort(t *testing.T) { ...@@ -486,7 +486,7 @@ func TestUDPProxyUpdatePort(t *testing.T) {
}, },
}) })
p := NewProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}) p := CreateProxier(lb, net.ParseIP("0.0.0.0"), &fakeIptables{}, net.ParseIP("127.0.0.1"))
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort("echo", "UDP", 0, time.Second)
......
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