github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97336 from maaoBit/remove_cleanup-ipvs

Browse Source 
remove --cleanup-ipvs flag of kube-proxy
This commit is contained in:
Kubernetes Prow Robot
2021-01-04 08:41:57 -08:00
committed by GitHub
parent 36bde432ad d001b9b72a
commit ffe74b2cf1
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/proxy/ipvs/proxier.go
View File

@@ -803,13 +803,9 @@ func cleanupIptablesLeftovers(ipt utiliptables.Interface) (encounteredError bool
}
// CleanupLeftovers clean up all ipvs and iptables rules created by ipvs Proxier.
func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset utilipset.Interface, cleanupIPVS bool) (encounteredError bool) {
if cleanupIPVS {
// Return immediately when ipvs interface is nil - Probably initialization failed in somewhere.
if ipvs == nil {
return true
}
encounteredError = false
func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset utilipset.Interface) (encounteredError bool) {
// Clear all ipvs rules
if ipvs != nil {
err := ipvs.Flush()
if err != nil {
klog.Errorf("Error flushing IPVS rules: %v", err)

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

@@ -266,7 +266,7 @@ func TestCleanupLeftovers(t *testing.T) {
fp.syncProxyRules()
// test cleanup left over
if CleanupLeftovers(ipvs, ipt, ipset, true) {
if CleanupLeftovers(ipvs, ipt, ipset) {
t.Errorf("Cleanup leftovers failed")
}
}