Merge pull request #25074 from AdoHe/remove_container_args

Automatic merge from submit-queue

update kubectl apply help info

Please refer #22342 for more detail. @bgrant0607 ptal. Also I have open a PR to update docs on `kuberntes.github.io`
This commit is contained in:
k8s-merge-robot 2016-05-04 14:44:14 -07:00
commit 53ea2cb444
4 changed files with 7 additions and 2 deletions

View File

@ -15,6 +15,7 @@ kubectl apply \- Apply a configuration to a resource by filename or stdin
.PP
Apply a configuration to a resource by filename or stdin.
The resource will be created if it doesn't exist yet.
To use 'apply', always create the resource initially with either 'apply' or 'create \-\-save\-config'.
.PP
JSON and YAML formats are accepted.

View File

@ -41,6 +41,7 @@ Apply a configuration to a resource by filename or stdin
Apply a configuration to a resource by filename or stdin.
The resource will be created if it doesn't exist yet.
To use 'apply', always create the resource initially with either 'apply' or 'create --save-config'.
JSON and YAML formats are accepted.
@ -102,7 +103,7 @@ cat pod.json | kubectl apply -f -
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
###### Auto generated by spf13/cobra on 30-Mar-2016
###### Auto generated by spf13/cobra on 3-May-2016
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_apply.md?pixel)]()

View File

@ -1,7 +1,9 @@
name: apply
synopsis: Apply a configuration to a resource by filename or stdin
description: "Apply a configuration to a resource by filename or stdin.\nThe resource
will be created if it doesn't exist yet. \n\nJSON and YAML formats are accepted."
will be created if it doesn't exist yet. \nTo use 'apply', always create the resource
initially with either 'apply' or 'create --save-config'.\n\nJSON and YAML formats
are accepted."
options:
- name: filename
shorthand: f

View File

@ -41,6 +41,7 @@ type ApplyOptions struct {
const (
apply_long = `Apply a configuration to a resource by filename or stdin.
The resource will be created if it doesn't exist yet.
To use 'apply', always create the resource initially with either 'apply' or 'create --save-config'.
JSON and YAML formats are accepted.`
apply_example = `# Apply the configuration in pod.json to a pod.