From c629ec961c7779138454b171dd817a22bde0e46c Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Tue, 10 Oct 2017 11:56:06 -0700 Subject: [PATCH] clarifying CLI output backporting documentation changes made to generated CLI documentation so that the source is correct for updates to the documentation and kubernetes website. This is part of what is needed to resolve https://github.com/kubernetes/kubernetes.github.io/issues/5618 and is updated based on review feedback while fixing that bug at https://github.com/kubernetes/kubernetes.github.io/pull/5824 --- cmd/kube-proxy/app/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index a79122e9fba..2afeb633f72 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -338,8 +338,8 @@ func NewProxyCommand() *cobra.Command { Use: "kube-proxy", Long: `The Kubernetes network proxy runs on each node. This reflects services as defined in the Kubernetes API on each node and can do simple -TCP,UDP stream forwarding or round robin TCP,UDP forwarding across a set of backends. -Service cluster ips and ports are currently found through Docker-links-compatible +TCP and UDP stream forwarding or round robin TCP and UDP forwarding across a set of backends. +Service cluster IPs and ports are currently found through Docker-links-compatible environment variables specifying ports opened by the service proxy. There is an optional addon that provides cluster DNS for these cluster IPs. The user must create a service with the apiserver API to configure the proxy.`,