Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update kubectl apply help info #25074

Merged
merged 1 commit into from
May 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/man/man1/kubectl-apply.1
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion docs/user-guide/kubectl/kubectl_apply.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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)]()
Expand Down
4 changes: 3 additions & 1 deletion docs/yaml/kubectl/kubectl_apply.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/kubectl/cmd/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down