Merge pull request #8948 from jlowdermilk/proxy-help

thockin · thockin · commit 0dab399b6a56 · 2015-05-28T15:29:11.000-07:00
update/fix kubectl proxy example in help string
diff --git a/docs/kubectl_proxy.md b/docs/kubectl_proxy.md
@@ -18,8 +18,8 @@ kubectl proxy [--port=PORT] [--www=static-dir] [--www-prefix=prefix] [--api-pref
 $ kubectl proxy --port=8011 --www=./local/www/
 
 // Run a proxy to kubernetes apiserver, changing the api prefix to k8s-api
-// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta1/pods/
-$ kubectl proxy --api-prefix=k8s-api
+// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta3/pods/
+$ kubectl proxy --api-prefix=/k8s-api
 ```
 
 ### Options
@@ -64,6 +64,6 @@ $ kubectl proxy --api-prefix=k8s-api
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.188518514 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-28 20:57:46.689818993 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_proxy.md?pixel)]()
diff --git a/docs/man/man1/kubectl-proxy.1 b/docs/man/man1/kubectl-proxy.1
@@ -145,8 +145,8 @@ Run a proxy to the Kubernetes API server.
 $ kubectl proxy \-\-port=8011 \-\-www=./local/www/
 
 // Run a proxy to kubernetes apiserver, changing the api prefix to k8s\-api
-// This makes e.g. the pods api available at localhost:8011/k8s\-api/v1beta1/pods/
-$ kubectl proxy \-\-api\-prefix=k8s\-api
+// This makes e.g. the pods api available at localhost:8011/k8s\-api/v1beta3/pods/
+$ kubectl proxy \-\-api\-prefix=/k8s\-api
 
 .fi
 .RE
diff --git a/pkg/kubectl/cmd/proxy.go b/pkg/kubectl/cmd/proxy.go
@@ -32,8 +32,8 @@ const (
 $ kubectl proxy --port=8011 --www=./local/www/
 
 // Run a proxy to kubernetes apiserver, changing the api prefix to k8s-api
-// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta1/pods/
-$ kubectl proxy --api-prefix=k8s-api`
+// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta3/pods/
+$ kubectl proxy --api-prefix=/k8s-api`
 )
 
 func NewCmdProxy(f *cmdutil.Factory, out io.Writer) *cobra.Command {

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ const (`
`32`	`32`	`$ kubectl proxy --port=8011 --www=./local/www/`
`33`	`33`
`34`	`34`	`// Run a proxy to kubernetes apiserver, changing the api prefix to k8s-api`
`35`		`-// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta1/pods/`
`36`		-$ kubectl proxy --api-prefix=k8s-api`
	`35`	`+// This makes e.g. the pods api available at localhost:8011/k8s-api/v1beta3/pods/`
	`36`	+$ kubectl proxy --api-prefix=/k8s-api`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`func NewCmdProxy(f cmdutil.Factory, out io.Writer) cobra.Command {`