From 845451c8aff1fe1d85e15461cce241fc61419aca Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 14 Apr 2016 17:20:31 -0700 Subject: [PATCH] fix the build --- docs/yaml/kubectl/kubectl.yaml | 2 ++ docs/yaml/kubectl/kubectl_annotate.yaml | 13 ++++++++----- docs/yaml/kubectl/kubectl_api-versions.yaml | 2 ++ docs/yaml/kubectl/kubectl_apply.yaml | 2 ++ docs/yaml/kubectl/kubectl_attach.yaml | 2 ++ docs/yaml/kubectl/kubectl_autoscale.yaml | 2 ++ docs/yaml/kubectl/kubectl_cluster-info.yaml | 2 ++ docs/yaml/kubectl/kubectl_config.yaml | 2 ++ docs/yaml/kubectl/kubectl_convert.yaml | 2 ++ docs/yaml/kubectl/kubectl_cordon.yaml | 2 ++ docs/yaml/kubectl/kubectl_create.yaml | 2 ++ docs/yaml/kubectl/kubectl_delete.yaml | 9 +++++++++ docs/yaml/kubectl/kubectl_describe.yaml | 2 ++ docs/yaml/kubectl/kubectl_drain.yaml | 2 ++ docs/yaml/kubectl/kubectl_edit.yaml | 2 ++ docs/yaml/kubectl/kubectl_exec.yaml | 2 ++ docs/yaml/kubectl/kubectl_explain.yaml | 2 ++ docs/yaml/kubectl/kubectl_expose.yaml | 17 ++++++++++------- docs/yaml/kubectl/kubectl_get.yaml | 2 ++ docs/yaml/kubectl/kubectl_label.yaml | 2 ++ docs/yaml/kubectl/kubectl_logs.yaml | 2 ++ docs/yaml/kubectl/kubectl_namespace.yaml | 2 ++ docs/yaml/kubectl/kubectl_patch.yaml | 2 ++ docs/yaml/kubectl/kubectl_port-forward.yaml | 2 ++ docs/yaml/kubectl/kubectl_proxy.yaml | 2 ++ docs/yaml/kubectl/kubectl_replace.yaml | 2 ++ docs/yaml/kubectl/kubectl_rolling-update.yaml | 2 ++ docs/yaml/kubectl/kubectl_rollout.yaml | 2 ++ docs/yaml/kubectl/kubectl_run.yaml | 2 ++ docs/yaml/kubectl/kubectl_scale.yaml | 2 ++ docs/yaml/kubectl/kubectl_stop.yaml | 2 ++ docs/yaml/kubectl/kubectl_uncordon.yaml | 2 ++ docs/yaml/kubectl/kubectl_version.yaml | 2 ++ 33 files changed, 87 insertions(+), 12 deletions(-) diff --git a/docs/yaml/kubectl/kubectl.yaml b/docs/yaml/kubectl/kubectl.yaml index 5c2b467293..3892e8332a 100644 --- a/docs/yaml/kubectl/kubectl.yaml +++ b/docs/yaml/kubectl/kubectl.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_annotate.yaml b/docs/yaml/kubectl/kubectl_annotate.yaml index 2bdedb5b99..ba5307f746 100644 --- a/docs/yaml/kubectl/kubectl_annotate.yaml +++ b/docs/yaml/kubectl/kubectl_annotate.yaml @@ -1,6 +1,6 @@ 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. @@ -8,10 +8,11 @@ description: |- 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" @@ -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 diff --git a/docs/yaml/kubectl/kubectl_api-versions.yaml b/docs/yaml/kubectl/kubectl_api-versions.yaml index bf31b2fb7b..eae489900a 100644 --- a/docs/yaml/kubectl/kubectl_api-versions.yaml +++ b/docs/yaml/kubectl/kubectl_api-versions.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_apply.yaml b/docs/yaml/kubectl/kubectl_apply.yaml index ad26ac944a..fa0909b2a5 100644 --- a/docs/yaml/kubectl/kubectl_apply.yaml +++ b/docs/yaml/kubectl/kubectl_apply.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_attach.yaml b/docs/yaml/kubectl/kubectl_attach.yaml index 50328f0348..56620043ff 100644 --- a/docs/yaml/kubectl/kubectl_attach.yaml +++ b/docs/yaml/kubectl/kubectl_attach.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_autoscale.yaml b/docs/yaml/kubectl/kubectl_autoscale.yaml index 863190d6aa..722d60ba9c 100644 --- a/docs/yaml/kubectl/kubectl_autoscale.yaml +++ b/docs/yaml/kubectl/kubectl_autoscale.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_cluster-info.yaml b/docs/yaml/kubectl/kubectl_cluster-info.yaml index a70904ec6e..9aeee3f3de 100644 --- a/docs/yaml/kubectl/kubectl_cluster-info.yaml +++ b/docs/yaml/kubectl/kubectl_cluster-info.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_config.yaml b/docs/yaml/kubectl/kubectl_config.yaml index 559f3e4e2d..c439c996ab 100644 --- a/docs/yaml/kubectl/kubectl_config.yaml +++ b/docs/yaml/kubectl/kubectl_config.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_convert.yaml b/docs/yaml/kubectl/kubectl_convert.yaml index a8f73315c4..ec651ba01e 100644 --- a/docs/yaml/kubectl/kubectl_convert.yaml +++ b/docs/yaml/kubectl/kubectl_convert.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_cordon.yaml b/docs/yaml/kubectl/kubectl_cordon.yaml index 28619589e4..9db7fb3862 100644 --- a/docs/yaml/kubectl/kubectl_cordon.yaml +++ b/docs/yaml/kubectl/kubectl_cordon.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_create.yaml b/docs/yaml/kubectl/kubectl_create.yaml index 3f3973191d..7c642dffb4 100644 --- a/docs/yaml/kubectl/kubectl_create.yaml +++ b/docs/yaml/kubectl/kubectl_create.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_delete.yaml b/docs/yaml/kubectl/kubectl_delete.yaml index 8d1f3acc2f..b42ede19d6 100644 --- a/docs/yaml/kubectl/kubectl_delete.yaml +++ b/docs/yaml/kubectl/kubectl_delete.yaml @@ -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: | @@ -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 @@ -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 diff --git a/docs/yaml/kubectl/kubectl_describe.yaml b/docs/yaml/kubectl/kubectl_describe.yaml index a88077c48d..c62f47b113 100644 --- a/docs/yaml/kubectl/kubectl_describe.yaml +++ b/docs/yaml/kubectl/kubectl_describe.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_drain.yaml b/docs/yaml/kubectl/kubectl_drain.yaml index 2933b3536f..128e32f146 100644 --- a/docs/yaml/kubectl/kubectl_drain.yaml +++ b/docs/yaml/kubectl/kubectl_drain.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_edit.yaml b/docs/yaml/kubectl/kubectl_edit.yaml index 785244bffd..7d9d6db273 100644 --- a/docs/yaml/kubectl/kubectl_edit.yaml +++ b/docs/yaml/kubectl/kubectl_edit.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_exec.yaml b/docs/yaml/kubectl/kubectl_exec.yaml index a8e2d455f8..ba20b93998 100644 --- a/docs/yaml/kubectl/kubectl_exec.yaml +++ b/docs/yaml/kubectl/kubectl_exec.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_explain.yaml b/docs/yaml/kubectl/kubectl_explain.yaml index c1c91f1bbb..565aca130e 100644 --- a/docs/yaml/kubectl/kubectl_explain.yaml +++ b/docs/yaml/kubectl/kubectl_explain.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_expose.yaml b/docs/yaml/kubectl/kubectl_expose.yaml index 5cf5946794..138f95afb9 100644 --- a/docs/yaml/kubectl/kubectl_expose.yaml +++ b/docs/yaml/kubectl/kubectl_expose.yaml @@ -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 @@ -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 diff --git a/docs/yaml/kubectl/kubectl_get.yaml b/docs/yaml/kubectl/kubectl_get.yaml index a26ed32e0d..80d70009b4 100644 --- a/docs/yaml/kubectl/kubectl_get.yaml +++ b/docs/yaml/kubectl/kubectl_get.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_label.yaml b/docs/yaml/kubectl/kubectl_label.yaml index 9628f7e60f..b16f695479 100644 --- a/docs/yaml/kubectl/kubectl_label.yaml +++ b/docs/yaml/kubectl/kubectl_label.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_logs.yaml b/docs/yaml/kubectl/kubectl_logs.yaml index 18077890a1..0966719541 100644 --- a/docs/yaml/kubectl/kubectl_logs.yaml +++ b/docs/yaml/kubectl/kubectl_logs.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_namespace.yaml b/docs/yaml/kubectl/kubectl_namespace.yaml index 4378727b83..eaf3fd37ac 100644 --- a/docs/yaml/kubectl/kubectl_namespace.yaml +++ b/docs/yaml/kubectl/kubectl_namespace.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_patch.yaml b/docs/yaml/kubectl/kubectl_patch.yaml index 990cd0fe27..a3731b8f60 100644 --- a/docs/yaml/kubectl/kubectl_patch.yaml +++ b/docs/yaml/kubectl/kubectl_patch.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_port-forward.yaml b/docs/yaml/kubectl/kubectl_port-forward.yaml index 657fc53cc3..45b71c7970 100644 --- a/docs/yaml/kubectl/kubectl_port-forward.yaml +++ b/docs/yaml/kubectl/kubectl_port-forward.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_proxy.yaml b/docs/yaml/kubectl/kubectl_proxy.yaml index 259fab6bbf..eedd071748 100644 --- a/docs/yaml/kubectl/kubectl_proxy.yaml +++ b/docs/yaml/kubectl/kubectl_proxy.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_replace.yaml b/docs/yaml/kubectl/kubectl_replace.yaml index 89806cbaa5..a15d96a05a 100644 --- a/docs/yaml/kubectl/kubectl_replace.yaml +++ b/docs/yaml/kubectl/kubectl_replace.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_rolling-update.yaml b/docs/yaml/kubectl/kubectl_rolling-update.yaml index eab9c92c9d..9dc739e96b 100644 --- a/docs/yaml/kubectl/kubectl_rolling-update.yaml +++ b/docs/yaml/kubectl/kubectl_rolling-update.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_rollout.yaml b/docs/yaml/kubectl/kubectl_rollout.yaml index 4c7dad5474..54c6ff6531 100644 --- a/docs/yaml/kubectl/kubectl_rollout.yaml +++ b/docs/yaml/kubectl/kubectl_rollout.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_run.yaml b/docs/yaml/kubectl/kubectl_run.yaml index f7ad3a81c8..10dd4ab78b 100644 --- a/docs/yaml/kubectl/kubectl_run.yaml +++ b/docs/yaml/kubectl/kubectl_run.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_scale.yaml b/docs/yaml/kubectl/kubectl_scale.yaml index 66129c0ae4..6ac6d0ce7c 100644 --- a/docs/yaml/kubectl/kubectl_scale.yaml +++ b/docs/yaml/kubectl/kubectl_scale.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_stop.yaml b/docs/yaml/kubectl/kubectl_stop.yaml index a0d6e78a3d..833228dbcf 100644 --- a/docs/yaml/kubectl/kubectl_stop.yaml +++ b/docs/yaml/kubectl/kubectl_stop.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_uncordon.yaml b/docs/yaml/kubectl/kubectl_uncordon.yaml index 55c71fb004..08078846e5 100644 --- a/docs/yaml/kubectl/kubectl_uncordon.yaml +++ b/docs/yaml/kubectl/kubectl_uncordon.yaml @@ -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 diff --git a/docs/yaml/kubectl/kubectl_version.yaml b/docs/yaml/kubectl/kubectl_version.yaml index 1bc9e7181c..c01c2be4ac 100644 --- a/docs/yaml/kubectl/kubectl_version.yaml +++ b/docs/yaml/kubectl/kubectl_version.yaml @@ -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