Merge pull request #52235 from xiangpengzhao/remove-hostportChainName

Automatic merge from submit-queue (batch tested with PRs 52109, 52235, 51809, 52161, 50080). 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 backward compatibility of hostportChainName **What this PR does / why we need it**: fix TODO. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: /assign @freehan **Release note**: ```release-note NONE ```

Merge pull request #52235 from xiangpengzhao/remove-hostportChainName
7485aad0 · Kubernetes Submit Queue · GitHub · 32144cd7 · 0484a1c2 · 7485aad0
Commit 7485aad0 authored Sep 23, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 23, 2017
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

hostport_manager.go pkg/kubelet/network/hostport/hostport_manager.go +0 -5

No files found.
--- a/pkg/kubelet/network/hostport/hostport_manager.go
+++ b/pkg/kubelet/network/hostport/hostport_manager.go
@@ -177,11 +177,6 @@ func (hm *hostportManager) Remove(id string, podPortMapping *PodPortMapping) (er
 	chainsToRemove := []utiliptables.Chain{}
 	for _, pm := range hostportMappings {
 		chainsToRemove = append(chainsToRemove, getHostportChain(id, pm))
-		// To preserve backward compatibility for k8s 1.5 or earlier.
-		// Need to remove hostport chains added by hostportSyncer if there is any
-		// TODO: remove this in 1.7
-		chainsToRemove = append(chainsToRemove, hostportChainName(pm, getPodFullName(podPortMapping)))
 	}
 	// remove rules that consists of target chains