diff --git a/cmd/kube-proxy/app/options.go b/cmd/kube-proxy/app/options.go index 2a14effae7a..b643ce66e52 100644 --- a/cmd/kube-proxy/app/options.go +++ b/cmd/kube-proxy/app/options.go @@ -170,8 +170,6 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) { _ = fs.MarkDeprecated("healthz-port", "This flag is deprecated and will be removed in a future release. Please use --healthz-bind-address instead.") fs.Int32Var(&o.metricsPort, "metrics-port", o.metricsPort, "The port to bind the metrics server. Use 0 to disable.") _ = fs.MarkDeprecated("metrics-port", "This flag is deprecated and will be removed in a future release. Please use --metrics-bind-address instead.") - fs.Var(utilflag.PortRangeVar{Val: &o.config.PortRange}, "proxy-port-range", "This was previously used to configure the userspace proxy, but is now unused.") - _ = fs.MarkDeprecated("proxy-port-range", "This flag has no effect and will be removed in a future release.") logsapi.AddFlags(&o.config.Logging, fs) } diff --git a/cmd/kube-proxy/app/options_test.go b/cmd/kube-proxy/app/options_test.go index c7eb3a2063b..1d76a09ce67 100644 --- a/cmd/kube-proxy/app/options_test.go +++ b/cmd/kube-proxy/app/options_test.go @@ -224,7 +224,6 @@ nodePortAddresses: }, MetricsBindAddress: tc.metricsBindAddress, Mode: kubeproxyconfig.ProxyMode(tc.mode), - PortRange: "2-7", NodePortAddresses: []string{"10.20.30.40/16", "fd00:1::0/64"}, DetectLocalMode: kubeproxyconfig.LocalModeClusterCIDR, DetectLocal: kubeproxyconfig.DetectLocalConfiguration{ diff --git a/pkg/proxy/apis/config/types.go b/pkg/proxy/apis/config/types.go index 715d6992be5..c811ed1d133 100644 --- a/pkg/proxy/apis/config/types.go +++ b/pkg/proxy/apis/config/types.go @@ -236,9 +236,6 @@ type KubeProxyConfiguration struct { // configSyncPeriod is how often configuration from the apiserver is refreshed. Must be greater // than 0. ConfigSyncPeriod metav1.Duration - - // portRange was previously used to configure the userspace proxy, but is now unused. - PortRange string } // ProxyMode represents modes used by the Kubernetes proxy server. diff --git a/pkg/proxy/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/proxy/apis/config/v1alpha1/zz_generated.conversion.go index 8584faab6b5..b61d6aaeeda 100644 --- a/pkg/proxy/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/proxy/apis/config/v1alpha1/zz_generated.conversion.go @@ -165,7 +165,7 @@ func autoConvert_v1alpha1_KubeProxyConfiguration_To_config_KubeProxyConfiguratio // WARNING: in.OOMScoreAdj requires manual conversion: does not exist in peer-type // WARNING: in.Conntrack requires manual conversion: does not exist in peer-type out.ConfigSyncPeriod = in.ConfigSyncPeriod - out.PortRange = in.PortRange + // WARNING: in.PortRange requires manual conversion: does not exist in peer-type // WARNING: in.WindowsRunAsService requires manual conversion: does not exist in peer-type return nil } @@ -206,7 +206,6 @@ func autoConvert_config_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguratio // WARNING: in.SyncPeriod requires manual conversion: does not exist in peer-type // WARNING: in.MinSyncPeriod requires manual conversion: does not exist in peer-type out.ConfigSyncPeriod = in.ConfigSyncPeriod - out.PortRange = in.PortRange return nil } diff --git a/pkg/proxy/apis/config/validation/validation.go b/pkg/proxy/apis/config/validation/validation.go index 2d49b19f9ab..3568f50b29e 100644 --- a/pkg/proxy/apis/config/validation/validation.go +++ b/pkg/proxy/apis/config/validation/validation.go @@ -23,7 +23,6 @@ import ( "strconv" "strings" - utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -80,10 +79,6 @@ func Validate(config *kubeproxyconfig.KubeProxyConfiguration) field.ErrorList { } allErrs = append(allErrs, validateHostPort(config.MetricsBindAddress, newPath.Child("MetricsBindAddress"))...) - if _, err := utilnet.ParsePortRange(config.PortRange); err != nil { - allErrs = append(allErrs, field.Invalid(newPath.Child("PortRange"), config.PortRange, "must be a valid port range (e.g. 300-2000)")) - } - allErrs = append(allErrs, validateKubeProxyNodePortAddress(config.NodePortAddresses, newPath.Child("NodePortAddresses"))...) allErrs = append(allErrs, validateShowHiddenMetricsVersion(config.ShowHiddenMetricsForVersion, newPath.Child("ShowHiddenMetricsForVersion"))...)