Merge pull request #52547 from xiangpengzhao/remove-kubelet-flag

Automatic merge from submit-queue (batch tested with PRs 54868, 52547). 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 deprecated stale flags of kube-apiserver **What this PR does / why we need it**: These flags have been marked as deprecated for more than two years. This PR removes them. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # ref: #8740 **Special notes for your reviewer**: **Release note**: ```release-note action required: Deprecated flags `--portal-net` and `service-node-ports` of kube-apiserver are removed. ```

Merge pull request #52547 from xiangpengzhao/remove-kubelet-flag
7a0979c5 · Kubernetes Submit Queue · GitHub · 065e4508 · 50ab7908 · 7a0979c5
Unverified Commit 7a0979c5 authored Nov 09, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

options.go cmd/kube-apiserver/app/options/options.go +0 -6

No files found.
--- a/cmd/kube-apiserver/app/options/options.go
+++ b/cmd/kube-apiserver/app/options/options.go
@@ -184,15 +184,9 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
 		"A CIDR notation IP range from which to assign service cluster IPs. This must not "+
 		"overlap with any IP ranges assigned to nodes for pods.")

-	fs.IPNetVar(&s.ServiceClusterIPRange, "portal-net", s.ServiceClusterIPRange,
-		"DEPRECATED: see --service-cluster-ip-range instead.")
-	fs.MarkDeprecated("portal-net", "see --service-cluster-ip-range instead")
-
 	fs.Var(&s.ServiceNodePortRange, "service-node-port-range", ""+
 		"A port range to reserve for services with NodePort visibility. "+
 		"Example: '30000-32767'. Inclusive at both ends of the range.")
-	fs.Var(&s.ServiceNodePortRange, "service-node-ports", "DEPRECATED: see --service-node-port-range instead")
-	fs.MarkDeprecated("service-node-ports", "see --service-node-port-range instead")

 	// Kubelet related flags:
 	fs.BoolVar(&s.KubeletConfig.EnableHttps, "kubelet-https", s.KubeletConfig.EnableHttps,