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

fix the build #24303

Merged
merged 1 commit into from
Apr 15, 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
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
13 changes: 8 additions & 5 deletions docs/yaml/kubectl/kubectl_annotate.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: annotate
synopsis: Update the annotations on a resource
description: |-
description: |
Update the annotations on one or more resources.

An annotation is a key/value pair that can hold larger (compared to a label), and possibly not human-readable, data.
It is intended to store non-identifying auxiliary data, especially data manipulated by tools and system extensions.
If --overwrite is true, then existing annotations can be overwritten, otherwise attempting to overwrite an annotation will result in an error.
If --resource-version is specified, then updates will use this resource version, otherwise the existing resource-version will be used.

Possible resources include (case insensitive): pods (po), services (svc),
replicationcontrollers (rc), nodes (no), events (ev), componentstatuses (cs),
limitranges (limits), persistentvolumes (pv), persistentvolumeclaims (pvc),
horizontalpodautoscalers (hpa), resourcequotas (quota) or secrets.
Possible resources include (case insensitive):
pod (po), service (svc), replicationcontroller (rc),
node (no), event (ev), componentstatuse (cs),
limitrange (limits), persistentvolume (pv), persistentvolumeclaim (pvc),
horizontalpodautoscaler (hpa), resourcequota (quota), secret
options:
- name: all
default_value: "false"
Expand Down Expand Up @@ -75,6 +76,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_api-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_attach.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_cluster-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_convert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_cordon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
9 changes: 9 additions & 0 deletions docs/yaml/kubectl/kubectl_delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ options:
default_value: "true"
usage: |
If true, include definitions of new APIs via calls to the API server. [default true]
- name: now
default_value: "false"
usage: |
If true, resources are force terminated without graceful deletion (same as --grace-period=0).
- name: output
shorthand: o
usage: |
Expand All @@ -58,6 +62,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down Expand Up @@ -123,6 +129,9 @@ example: |-
# Delete pods and services with label name=myLabel.
kubectl delete pods,services -l name=myLabel

# Delete a pod immediately (no graceful shutdown)
kubectl delete pod foo --now

# Delete a pod with UID 1234-56-7890-234234-456456.
kubectl delete pod 1234-56-7890-234234-456456

Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_describe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_drain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_edit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_exec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_explain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
17 changes: 10 additions & 7 deletions docs/yaml/kubectl/kubectl_expose.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: expose
synopsis: |
Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service
description: "Take a deployment, service, replica set, replication controller, or
pod and expose it as a new Kubernetes service.\n\nLooks up a deployment, service,
replica set, replication controller or pod by name and uses the selector\nfor that
resource as the selector for a new service on the specified port. A deployment or
replica set\nwill be exposed as a service only if its selector is convertible to
a selector that service supports,\ni.e. when the selector contains only the matchLabels
description: "Expose a resource as a new Kubernetes service.\n\nLooks up a deployment,
service, replica set, replication controller or pod by name and uses the selector\nfor
that resource as the selector for a new service on the specified port. A deployment
or replica set\nwill be exposed as a service only if its selector is convertible
to a selector that service supports,\ni.e. when the selector contains only the matchLabels
component. Note that if no port is specified via\n--port and the exposed resource
has multiple ports, all will be re-used by the new service. Also if no \nlabels
are specified, the new service will re-use the labels from the resource it exposes."
are specified, the new service will re-use the labels from the resource it exposes.\n\nPossible
resources include (case insensitive):\n pod (po), service (svc), replicationcontroller
(rc),\n deployment, replicaset (rs)\n"
options:
- name: container-port
usage: Synonym for --target-port
Expand Down Expand Up @@ -106,6 +107,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_get.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_port-forward.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_replace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_rolling-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_rollout.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_scale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_stop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_uncordon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down
2 changes: 2 additions & 0 deletions docs/yaml/kubectl/kubectl_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ inherited_options:
- name: api-version
usage: |
DEPRECATED: The API version to use when talking to the server
- name: as
usage: Username to impersonate for the operation.
- name: certificate-authority
usage: Path to a cert. file for the certificate authority.
- name: client-certificate
Expand Down