diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go index c6bbcfd41f9..7ebb67531b8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go @@ -71,21 +71,16 @@ var ( the remote kubernetes API Server port, except for the path matching the static content path.`)) proxyExample = templates.Examples(i18n.T(` - # To proxy all of the kubernetes api and nothing else, use: + # To proxy all of the kubernetes api and nothing else. + kubectl proxy --api-prefix=/ - $ kubectl proxy --api-prefix=/ + # To proxy only part of the kubernetes api and also some static files. + # You can get pods info with 'curl localhost:8001/api/v1/pods' + kubectl proxy --www=/my/files --www-prefix=/static/ --api-prefix=/api/ - # To proxy only part of the kubernetes api and also some static files: - - $ kubectl proxy --www=/my/files --www-prefix=/static/ --api-prefix=/api/ - - # The above lets you 'curl localhost:8001/api/v1/pods'. - - # To proxy the entire kubernetes api at a different root, use: - - $ kubectl proxy --api-prefix=/custom/ - - # The above lets you 'curl localhost:8001/custom/api/v1/pods' + # To proxy the entire kubernetes api at a different root. + # You can get pods info with 'curl localhost:8001/custom/api/v1/pods' + kubectl proxy --api-prefix=/custom/ # Run a proxy to kubernetes apiserver on port 8011, serving static content from ./local/www/ kubectl proxy --port=8011 --www=./local/www/ @@ -133,13 +128,13 @@ func NewCmdProxy(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr cmd.Flags().StringVarP(&o.staticDir, "www", "w", o.staticDir, "Also serve static files from the given directory under the specified prefix.") cmd.Flags().StringVarP(&o.staticPrefix, "www-prefix", "P", o.staticPrefix, "Prefix to serve static files under, if static file directory is specified.") - cmd.Flags().StringVarP(&o.apiPrefix, "api-prefix", "", o.apiPrefix, "Prefix to serve the proxied API under.") + cmd.Flags().StringVar(&o.apiPrefix, "api-prefix", o.apiPrefix, "Prefix to serve the proxied API under.") cmd.Flags().StringVar(&o.acceptPaths, "accept-paths", o.acceptPaths, "Regular expression for paths that the proxy should accept.") cmd.Flags().StringVar(&o.rejectPaths, "reject-paths", o.rejectPaths, "Regular expression for paths that the proxy should reject. Paths specified here will be rejected even accepted by --accept-paths.") cmd.Flags().StringVar(&o.acceptHosts, "accept-hosts", o.acceptHosts, "Regular expression for hosts that the proxy should accept.") cmd.Flags().StringVar(&o.rejectMethods, "reject-methods", o.rejectMethods, "Regular expression for HTTP methods that the proxy should reject (example --reject-methods='POST,PUT,PATCH'). ") cmd.Flags().IntVarP(&o.port, "port", "p", o.port, "The port on which to run the proxy. Set to 0 to pick a random port.") - cmd.Flags().StringVarP(&o.address, "address", "", o.address, "The IP address on which to serve on.") + cmd.Flags().StringVar(&o.address, "address", o.address, "The IP address on which to serve on.") cmd.Flags().BoolVar(&o.disableFilter, "disable-filter", o.disableFilter, "If true, disable request filtering in the proxy. This is dangerous, and can leave you vulnerable to XSRF attacks, when used with an accessible port.") cmd.Flags().StringVarP(&o.unixSocket, "unix-socket", "u", o.unixSocket, "Unix socket on which to run the proxy.") cmd.Flags().DurationVar(&o.keepalive, "keepalive", o.keepalive, "keepalive specifies the keep-alive period for an active network connection. Set to 0 to disable keepalive.")