diff --git a/docs/man/man1/kubectl-attach.1 b/docs/man/man1/kubectl-attach.1 index a5d499d20d2..a2ed28c6f67 100644 --- a/docs/man/man1/kubectl-attach.1 +++ b/docs/man/man1/kubectl-attach.1 @@ -19,7 +19,7 @@ Attach to a a process that is already running inside an existing container. .SH OPTIONS .PP \fB\-c\fP, \fB\-\-container\fP="" - Container name + Container name. If omitted, the first container in the pod will be chosen .PP \fB\-i\fP, \fB\-\-stdin\fP=false @@ -135,7 +135,7 @@ $ kubectl attach 123456\-7890 # Get output from ruby\-container from pod 123456\-7890 $ kubectl attach 123456\-7890 \-c ruby\-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby\-container from pod 123456\-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby\-container from pod 123456\-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl attach 123456\-7890 \-c ruby\-container \-i \-t diff --git a/docs/man/man1/kubectl-exec.1 b/docs/man/man1/kubectl-exec.1 index 65c5bf8f9c7..cf29ab57be5 100644 --- a/docs/man/man1/kubectl-exec.1 +++ b/docs/man/man1/kubectl-exec.1 @@ -139,7 +139,7 @@ $ kubectl exec 123456\-7890 date # Get output from running 'date' in ruby\-container from pod 123456\-7890 $ kubectl exec 123456\-7890 \-c ruby\-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby\-container from pod 123456\-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby\-container from pod 123456\-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl exec 123456\-7890 \-c ruby\-container \-i \-t \-\- bash \-il diff --git a/docs/man/man1/kubectl-run.1 b/docs/man/man1/kubectl-run.1 index 11869df0b6f..033437b3f91 100644 --- a/docs/man/man1/kubectl-run.1 +++ b/docs/man/man1/kubectl-run.1 @@ -216,7 +216,7 @@ $ kubectl run nginx \-\-image=nginx $ kubectl run hazelcast \-\-image=hazelcast \-\-port=5701 # Start a single instance of hazelcast and set environment variables "DNS\_DOMAIN=cluster" and "POD\_NAMESPACE=default" in the container. -$ kubectl run hazelcast \-\-image=hazelcast \-\-env="DNS\_DOMAIN=local" \-\-env="POD\_NAMESPACE=default" +$ kubectl run hazelcast \-\-image=hazelcast \-\-env="DNS\_DOMAIN=cluster" \-\-env="POD\_NAMESPACE=default" # Start a replicated instance of nginx. $ kubectl run nginx \-\-image=nginx \-\-replicas=5 diff --git a/docs/user-guide/kubectl/kubectl_attach.md b/docs/user-guide/kubectl/kubectl_attach.md index c47cf2035ec..e4aadda49a1 100644 --- a/docs/user-guide/kubectl/kubectl_attach.md +++ b/docs/user-guide/kubectl/kubectl_attach.md @@ -53,7 +53,7 @@ $ kubectl attach 123456-7890 # Get output from ruby-container from pod 123456-7890 $ kubectl attach 123456-7890 -c ruby-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl attach 123456-7890 -c ruby-container -i -t ``` @@ -61,7 +61,7 @@ $ kubectl attach 123456-7890 -c ruby-container -i -t ### Options ``` - -c, --container="": Container name + -c, --container="": Container name. If omitted, the first container in the pod will be chosen -i, --stdin[=false]: Pass stdin to the container -t, --tty[=false]: Stdin is a TTY ``` @@ -98,7 +98,7 @@ $ kubectl attach 123456-7890 -c ruby-container -i -t * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-09-10 18:53:03.155651469 +0000 UTC +###### Auto generated by spf13/cobra at 2015-09-28 05:58:08.934629688 +0000 UTC [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_attach.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_exec.md b/docs/user-guide/kubectl/kubectl_exec.md index 0324769af11..3ea0c61610d 100644 --- a/docs/user-guide/kubectl/kubectl_exec.md +++ b/docs/user-guide/kubectl/kubectl_exec.md @@ -53,7 +53,7 @@ $ kubectl exec 123456-7890 date # Get output from running 'date' in ruby-container from pod 123456-7890 $ kubectl exec 123456-7890 -c ruby-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il ``` @@ -99,7 +99,7 @@ $ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-09-10 18:53:03.156052759 +0000 UTC +###### Auto generated by spf13/cobra at 2015-09-28 05:58:08.934818621 +0000 UTC [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_exec.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_run.md b/docs/user-guide/kubectl/kubectl_run.md index 06ea96c79ad..ddc318b266c 100644 --- a/docs/user-guide/kubectl/kubectl_run.md +++ b/docs/user-guide/kubectl/kubectl_run.md @@ -55,7 +55,7 @@ $ kubectl run nginx --image=nginx $ kubectl run hazelcast --image=hazelcast --port=5701 # Start a single instance of hazelcast and set environment variables "DNS_DOMAIN=cluster" and "POD_NAMESPACE=default" in the container. -$ kubectl run hazelcast --image=hazelcast --env="DNS_DOMAIN=local" --env="POD_NAMESPACE=default" +$ kubectl run hazelcast --image=hazelcast --env="DNS_DOMAIN=cluster" --env="POD_NAMESPACE=default" # Start a replicated instance of nginx. $ kubectl run nginx --image=nginx --replicas=5 @@ -135,7 +135,7 @@ $ kubectl run nginx --image=nginx --command -- ... * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-09-10 18:53:03.15783835 +0000 UTC +###### Auto generated by spf13/cobra at 2015-09-28 05:58:08.93540785 +0000 UTC [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_run.md?pixel)]() diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go index e3433121d17..1df1f5c9796 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach.go @@ -39,7 +39,7 @@ $ kubectl attach 123456-7890 # Get output from ruby-container from pod 123456-7890 $ kubectl attach 123456-7890 -c ruby-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl attach 123456-7890 -c ruby-container -i -t` ) @@ -64,7 +64,7 @@ func NewCmdAttach(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer) }, } // TODO support UID - cmd.Flags().StringVarP(&options.ContainerName, "container", "c", "", "Container name") + cmd.Flags().StringVarP(&options.ContainerName, "container", "c", "", "Container name. If omitted, the first container in the pod will be chosen") cmd.Flags().BoolVarP(&options.Stdin, "stdin", "i", false, "Pass stdin to the container") cmd.Flags().BoolVarP(&options.TTY, "tty", "t", false, "Stdin is a TTY") return cmd diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index 97fc428ceb0..9d921ed41cf 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -39,7 +39,7 @@ $ kubectl exec 123456-7890 date # Get output from running 'date' in ruby-container from pod 123456-7890 $ kubectl exec 123456-7890 -c ruby-container date -# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-780 +# Switch to raw terminal mode, sends stdin to 'bash' in ruby-container from pod 123456-7890 # and sends stdout/stderr from 'bash' back to the client $ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il` ) diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 01db053040a..1128e248f0f 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -42,7 +42,7 @@ $ kubectl run nginx --image=nginx $ kubectl run hazelcast --image=hazelcast --port=5701 # Start a single instance of hazelcast and set environment variables "DNS_DOMAIN=cluster" and "POD_NAMESPACE=default" in the container. -$ kubectl run hazelcast --image=hazelcast --env="DNS_DOMAIN=local" --env="POD_NAMESPACE=default" +$ kubectl run hazelcast --image=hazelcast --env="DNS_DOMAIN=cluster" --env="POD_NAMESPACE=default" # Start a replicated instance of nginx. $ kubectl run nginx --image=nginx --replicas=5