diff --git a/cmd/kube-proxy/app/options.go b/cmd/kube-proxy/app/options.go index b643ce66e52..e63f6a6d610 100644 --- a/cmd/kube-proxy/app/options.go +++ b/cmd/kube-proxy/app/options.go @@ -123,7 +123,7 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) { "rather than being surprised when they are permanently removed in the release after that. "+ "This parameter is ignored if a config file is specified by --config.") fs.BoolVar(&o.InitAndExit, "init-only", o.InitAndExit, "If true, perform any initialization steps that must be done with full root privileges, and then exit. After doing this, you can run kube-proxy again with only the CAP_NET_ADMIN capability.") - fs.Var(&o.config.Mode, "proxy-mode", "Which proxy mode to use: on Linux this can be 'iptables' (default) or 'ipvs'. On Windows the only supported value is 'kernelspace'."+ + fs.Var(&o.config.Mode, "proxy-mode", "Which proxy mode to use: on Linux this can be 'iptables' (default), 'ipvs', or 'nftables'. On Windows the only supported value is 'kernelspace'."+ "This parameter is ignored if a config file is specified by --config.") fs.Int32Var(o.config.IPTables.MasqueradeBit, "iptables-masquerade-bit", ptr.Deref(o.config.IPTables.MasqueradeBit, 14), "If using the iptables or ipvs proxy mode, the bit of the fwmark space to mark packets requiring SNAT with. Must be within the range [0, 31].") diff --git a/pkg/proxy/apis/config/types.go b/pkg/proxy/apis/config/types.go index c811ed1d133..071a5d5dd63 100644 --- a/pkg/proxy/apis/config/types.go +++ b/pkg/proxy/apis/config/types.go @@ -240,10 +240,10 @@ type KubeProxyConfiguration struct { // ProxyMode represents modes used by the Kubernetes proxy server. // -// Currently, three modes of proxy are available on Linux platforms: 'iptables', 'ipvs', -// and 'nftables'. One mode of proxy is available on Windows platforms: 'kernelspace'. +// Three modes of proxy are available on Linux platforms: `iptables`, `ipvs`, and +// `nftables`. One mode of proxy is available on Windows platforms: `kernelspace`. // -// If the proxy mode is unspecified, the best-available proxy mode will be used (currently this +// If the proxy mode is unspecified, a default proxy mode will be used (currently this // is `iptables` on Linux and `kernelspace` on Windows). If the selected proxy mode cannot be // used (due to lack of kernel support, missing userspace components, etc) then kube-proxy // will exit with an error. diff --git a/staging/src/k8s.io/kube-proxy/config/v1alpha1/types.go b/staging/src/k8s.io/kube-proxy/config/v1alpha1/types.go index 65418e4f8e7..f2469341780 100644 --- a/staging/src/k8s.io/kube-proxy/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kube-proxy/config/v1alpha1/types.go @@ -250,10 +250,10 @@ type KubeProxyConfiguration struct { // ProxyMode represents modes used by the Kubernetes proxy server. // -// Currently, two modes of proxy are available on Linux platforms: 'iptables' and 'ipvs'. -// One mode of proxy is available on Windows platforms: 'kernelspace'. +// Three modes of proxy are available on Linux platforms: `iptables`, `ipvs`, and +// `nftables`. One mode of proxy is available on Windows platforms: `kernelspace`. // -// If the proxy mode is unspecified, the best-available proxy mode will be used (currently this +// If the proxy mode is unspecified, a default proxy mode will be used (currently this // is `iptables` on Linux and `kernelspace` on Windows). If the selected proxy mode cannot be // used (due to lack of kernel support, missing userspace components, etc) then kube-proxy // will exit with an error.