github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #64495 from hanxiaoshuai/fix0530 

Automatic merge from submit-queue (batch tested with PRs 64338, 64219, 64486, 64495, 64347). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove unused parameter in func buildFakeProxier

**What this PR does / why we need it**:
remove unused parameter in func buildFakeProxier
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-05-30 20:17:22 -07:00 committed by GitHub
parent 4df4a607cd 9d944d30a6
commit 7a2bc5c47b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/proxy/ipvs/proxier_test.go
View File

@ -805,7 +805,7 @@ func TestLoadBalancer(t *testing.T) {
func TestOnlyLocalNodePorts(t *testing.T) { func TestOnlyLocalNodePorts(t *testing.T) {
nodeIP := net.ParseIP("100.101.102.103") nodeIP := net.ParseIP("100.101.102.103")
ipt, fp := buildFakeProxier([]net.IP{nodeIP}) ipt, fp := buildFakeProxier()
svcIP := "10.20.30.41" svcIP := "10.20.30.41"
svcPort := 80 svcPort := 80
@ -889,8 +889,7 @@ func TestOnlyLocalNodePorts(t *testing.T) {
checkIptables(t, ipt, epIpt) checkIptables(t, ipt, epIpt)
} }
func TestLoadBalanceSourceRanges(t *testing.T) { func TestLoadBalanceSourceRanges(t *testing.T) {
nodeIP := net.ParseIP("100.101.102.103") ipt, fp := buildFakeProxier()
ipt, fp := buildFakeProxier([]net.IP{nodeIP})
svcIP := "10.20.30.41" svcIP := "10.20.30.41"
svcPort := 80 svcPort := 80
@ -988,7 +987,7 @@ func TestLoadBalanceSourceRanges(t *testing.T) {
} }
func TestAcceptIPVSTraffic(t *testing.T) { func TestAcceptIPVSTraffic(t *testing.T) {
ipt, fp := buildFakeProxier(nil) ipt, fp := buildFakeProxier()
ingressIP := "1.2.3.4" ingressIP := "1.2.3.4"
externalIP := []string{"5.6.7.8"} externalIP := []string{"5.6.7.8"}
@ -1053,7 +1052,7 @@ func TestAcceptIPVSTraffic(t *testing.T) {
} }
func TestOnlyLocalLoadBalancing(t *testing.T) { func TestOnlyLocalLoadBalancing(t *testing.T) {
ipt, fp := buildFakeProxier(nil) ipt, fp := buildFakeProxier()
svcIP := "10.20.30.41" svcIP := "10.20.30.41"
svcPort := 80 svcPort := 80
@ -2548,7 +2547,7 @@ func Test_cleanLegacyService(t *testing.T) {
} }
} }
func buildFakeProxier(nodeIP []net.IP) (*iptablestest.FakeIPTables, *Proxier) { func buildFakeProxier() (*iptablestest.FakeIPTables, *Proxier) {
ipt := iptablestest.NewFake() ipt := iptablestest.NewFake()
ipvs := ipvstest.NewFake() ipvs := ipvstest.NewFake()
ipset := ipsettest.NewFake(testIPSetVersion) ipset := ipsettest.NewFake(testIPSetVersion)