diff --git a/docs/man/man1/kubectl-annotate.1 b/docs/man/man1/kubectl-annotate.1 index 6ddd1a19e9b..73e20129bcc 100644 --- a/docs/man/man1/kubectl-annotate.1 +++ b/docs/man/man1/kubectl-annotate.1 @@ -49,7 +49,7 @@ horizontalpodautoscalers (hpa), resourcequotas (quota) or secrets. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-overwrite\fP=false @@ -92,7 +92,7 @@ horizontalpodautoscalers (hpa), resourcequotas (quota) or secrets. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-api-versions.1 b/docs/man/man1/kubectl-api-versions.1 index c7b807912d7..1d86ea64ff2 100644 --- a/docs/man/man1/kubectl-api-versions.1 +++ b/docs/man/man1/kubectl-api-versions.1 @@ -23,7 +23,7 @@ Print the supported API versions on the server, in the form of "group/version". .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-apply.1 b/docs/man/man1/kubectl-apply.1 index 84b554ce96f..dc4eef3b28b 100644 --- a/docs/man/man1/kubectl-apply.1 +++ b/docs/man/man1/kubectl-apply.1 @@ -49,7 +49,7 @@ JSON and YAML formats are accepted. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-attach.1 b/docs/man/man1/kubectl-attach.1 index a303c6efd17..60e8c5444fb 100644 --- a/docs/man/man1/kubectl-attach.1 +++ b/docs/man/man1/kubectl-attach.1 @@ -37,7 +37,7 @@ Attach to a process that is already running inside an existing container. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-autoscale.1 b/docs/man/man1/kubectl-autoscale.1 index ffb92bf3946..5bb443ffea0 100644 --- a/docs/man/man1/kubectl-autoscale.1 +++ b/docs/man/man1/kubectl-autoscale.1 @@ -61,7 +61,7 @@ An autoscaler can automatically increase or decrease number of pods deployed wit .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-record\fP=false @@ -96,7 +96,7 @@ An autoscaler can automatically increase or decrease number of pods deployed wit .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-cluster-info.1 b/docs/man/man1/kubectl-cluster-info.1 index 01a0f2266d5..0a488b81a0b 100644 --- a/docs/man/man1/kubectl-cluster-info.1 +++ b/docs/man/man1/kubectl-cluster-info.1 @@ -23,7 +23,7 @@ Display addresses of the master and services with label kubernetes.io/cluster\-s .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-current-context.1 b/docs/man/man1/kubectl-config-current-context.1 index 2e2a52ece70..c45249ad1cd 100644 --- a/docs/man/man1/kubectl-config-current-context.1 +++ b/docs/man/man1/kubectl-config-current-context.1 @@ -23,7 +23,7 @@ Displays the current\-context .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-set-context.1 b/docs/man/man1/kubectl-config-set-context.1 index a2b8f6cde8c..5cb6ef76fc5 100644 --- a/docs/man/man1/kubectl-config-set-context.1 +++ b/docs/man/man1/kubectl-config-set-context.1 @@ -38,7 +38,7 @@ Specifying a name that already exists will merge new fields on top of existing v .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-set-credentials.1 b/docs/man/man1/kubectl-config-set-credentials.1 index ed86d0d5f4b..c8b7c81ee89 100644 --- a/docs/man/man1/kubectl-config-set-credentials.1 +++ b/docs/man/man1/kubectl-config-set-credentials.1 @@ -65,7 +65,7 @@ Bearer token and basic auth are mutually exclusive. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-set.1 b/docs/man/man1/kubectl-config-set.1 index a344c224980..4e700579215 100644 --- a/docs/man/man1/kubectl-config-set.1 +++ b/docs/man/man1/kubectl-config-set.1 @@ -25,7 +25,7 @@ PROPERTY\_VALUE is the new value you wish to set. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-unset.1 b/docs/man/man1/kubectl-config-unset.1 index 793ac0906be..acea736be9e 100644 --- a/docs/man/man1/kubectl-config-unset.1 +++ b/docs/man/man1/kubectl-config-unset.1 @@ -24,7 +24,7 @@ PROPERTY\_NAME is a dot delimited name where each token represents either a attr .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-use-context.1 b/docs/man/man1/kubectl-config-use-context.1 index f89f34ff04f..4e4b87eb850 100644 --- a/docs/man/man1/kubectl-config-use-context.1 +++ b/docs/man/man1/kubectl-config-use-context.1 @@ -23,7 +23,7 @@ Sets the current\-context in a kubeconfig file .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config-view.1 b/docs/man/man1/kubectl-config-view.1 index ceca91a54c0..f7017d373a3 100644 --- a/docs/man/man1/kubectl-config-view.1 +++ b/docs/man/man1/kubectl-config-view.1 @@ -44,7 +44,7 @@ You can use \-\-output jsonpath={...} to extract specific values using a jsonpat .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-raw\fP=false @@ -75,7 +75,7 @@ You can use \-\-output jsonpath={...} to extract specific values using a jsonpat .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-config.1 b/docs/man/man1/kubectl-config.1 index ea4920af990..1375dbf935e 100644 --- a/docs/man/man1/kubectl-config.1 +++ b/docs/man/man1/kubectl-config.1 @@ -17,9 +17,9 @@ config modifies kubeconfig files using subcommands like "kubectl config set curr .PP The loading order follows these rules: - 1. If the \-\-kubeconfig flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. - 2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. - 3. Otherwise, ${HOME}/.kube/config is used and no merging takes place. +1. If the \-\-kubeconfig flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. +2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. +3. Otherwise, ${HOME}/.kube/config is used and no merging takes place. .SH OPTIONS @@ -35,7 +35,7 @@ The loading order follows these rules: .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-convert.1 b/docs/man/man1/kubectl-convert.1 index bb388379b02..6e29e6aafba 100644 --- a/docs/man/man1/kubectl-convert.1 +++ b/docs/man/man1/kubectl-convert.1 @@ -47,7 +47,7 @@ to change to output destination. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-schema\-cache\-dir\fP="\~/.kube/schema" @@ -82,7 +82,7 @@ to change to output destination. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-cordon.1 b/docs/man/man1/kubectl-cordon.1 index 916885dd0ac..1bccda74a22 100644 --- a/docs/man/man1/kubectl-cordon.1 +++ b/docs/man/man1/kubectl-cordon.1 @@ -23,7 +23,7 @@ Mark node as unschedulable. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-configmap.1 b/docs/man/man1/kubectl-create-configmap.1 index be3c5e9fcd6..148a904ab7c 100644 --- a/docs/man/man1/kubectl-create-configmap.1 +++ b/docs/man/man1/kubectl-create-configmap.1 @@ -57,7 +57,7 @@ symlinks, devices, pipes, etc). .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-save\-config\fP=false @@ -96,7 +96,7 @@ symlinks, devices, pipes, etc). .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-namespace.1 b/docs/man/man1/kubectl-create-namespace.1 index 21996057f76..b9a9e7365e2 100644 --- a/docs/man/man1/kubectl-create-namespace.1 +++ b/docs/man/man1/kubectl-create-namespace.1 @@ -37,7 +37,7 @@ Create a namespace with the specified name. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-save\-config\fP=false @@ -76,7 +76,7 @@ Create a namespace with the specified name. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-secret-docker-registry.1 b/docs/man/man1/kubectl-create-secret-docker-registry.1 index e12c1e8155b..f6e35142a56 100644 --- a/docs/man/man1/kubectl-create-secret-docker-registry.1 +++ b/docs/man/man1/kubectl-create-secret-docker-registry.1 @@ -68,7 +68,7 @@ by creating a dockercfg secret and attaching it to your service account. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-save\-config\fP=false @@ -107,7 +107,7 @@ by creating a dockercfg secret and attaching it to your service account. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-secret-generic.1 b/docs/man/man1/kubectl-create-secret-generic.1 index 2f71889e5fa..5728f667bf4 100644 --- a/docs/man/man1/kubectl-create-secret-generic.1 +++ b/docs/man/man1/kubectl-create-secret-generic.1 @@ -57,7 +57,7 @@ symlinks, devices, pipes, etc). .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-save\-config\fP=false @@ -100,7 +100,7 @@ symlinks, devices, pipes, etc). .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-secret.1 b/docs/man/man1/kubectl-create-secret.1 index 9cf76d40899..3a5eb0352ce 100644 --- a/docs/man/man1/kubectl-create-secret.1 +++ b/docs/man/man1/kubectl-create-secret.1 @@ -23,7 +23,7 @@ Create a secret using specified subcommand. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create-serviceaccount.1 b/docs/man/man1/kubectl-create-serviceaccount.1 index 47f7a369af5..6808a5df5e8 100644 --- a/docs/man/man1/kubectl-create-serviceaccount.1 +++ b/docs/man/man1/kubectl-create-serviceaccount.1 @@ -37,7 +37,7 @@ Create a service account with the specified name. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-save\-config\fP=false @@ -76,7 +76,7 @@ Create a service account with the specified name. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-create.1 b/docs/man/man1/kubectl-create.1 index 4c76dfbcb68..942410c5587 100644 --- a/docs/man/man1/kubectl-create.1 +++ b/docs/man/man1/kubectl-create.1 @@ -52,7 +52,7 @@ JSON and YAML formats are accepted. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-delete.1 b/docs/man/man1/kubectl-delete.1 index 01654c25ad0..82341aaa267 100644 --- a/docs/man/man1/kubectl-delete.1 +++ b/docs/man/man1/kubectl-delete.1 @@ -68,7 +68,7 @@ will be lost along with the rest of the resource. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-describe.1 b/docs/man/man1/kubectl-describe.1 index b196ae0b8eb..5b5e6d5ee9f 100644 --- a/docs/man/man1/kubectl-describe.1 +++ b/docs/man/man1/kubectl-describe.1 @@ -51,7 +51,7 @@ endpoints (ep) or secrets. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-drain.1 b/docs/man/man1/kubectl-drain.1 index d8514b45278..0e5132ecfd6 100644 --- a/docs/man/man1/kubectl-drain.1 +++ b/docs/man/man1/kubectl-drain.1 @@ -51,7 +51,7 @@ will make the node schedulable again. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-edit.1 b/docs/man/man1/kubectl-edit.1 index 29b0b8b187e..88b22032089 100644 --- a/docs/man/man1/kubectl-edit.1 +++ b/docs/man/man1/kubectl-edit.1 @@ -48,7 +48,7 @@ saved copy to include the latest resource version. .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-record\fP=false @@ -70,7 +70,7 @@ saved copy to include the latest resource version. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-exec.1 b/docs/man/man1/kubectl-exec.1 index 5b2be254654..9c4dca84801 100644 --- a/docs/man/man1/kubectl-exec.1 +++ b/docs/man/man1/kubectl-exec.1 @@ -41,7 +41,7 @@ Execute a command in a container. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-explain.1 b/docs/man/man1/kubectl-explain.1 index d5bfdfd7908..b2ee6c8bf42 100644 --- a/docs/man/man1/kubectl-explain.1 +++ b/docs/man/man1/kubectl-explain.1 @@ -36,7 +36,7 @@ or endpoints (ep). .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-expose.1 b/docs/man/man1/kubectl-expose.1 index f3771023eac..71013c200b4 100644 --- a/docs/man/man1/kubectl-expose.1 +++ b/docs/man/man1/kubectl-expose.1 @@ -73,7 +73,7 @@ if no labels are specified, the new service will re\-use the labels from the res .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-overrides\fP="" @@ -136,7 +136,7 @@ if no labels are specified, the new service will re\-use the labels from the res .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-get.1 b/docs/man/man1/kubectl-get.1 index e4ab057fc40..32edbe930f6 100644 --- a/docs/man/man1/kubectl-get.1 +++ b/docs/man/man1/kubectl-get.1 @@ -56,7 +56,7 @@ of the \-\-template flag, you can filter the attributes of the fetched resource( .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-l\fP, \fB\-\-selector\fP="" @@ -95,7 +95,7 @@ of the \-\-template flag, you can filter the attributes of the fetched resource( .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" @@ -203,7 +203,7 @@ kubectl get \-o json pod web\-pod\-13je7 kubectl get \-f pod.yaml \-o json # Return only the phase value of the specified pod. -kubectl get \-o template pod/web\-pod\-13je7 \-\-template={{.status.phase}} \-\-api\-version=v1 +kubectl get \-o template pod/web\-pod\-13je7 \-\-template={{.status.phase}} # List all replication controllers and services together in ps output format. kubectl get rc,services diff --git a/docs/man/man1/kubectl-label.1 b/docs/man/man1/kubectl-label.1 index d1f22512d33..478104c6042 100644 --- a/docs/man/man1/kubectl-label.1 +++ b/docs/man/man1/kubectl-label.1 @@ -46,7 +46,7 @@ If \-\-resource\-version is specified, then updates will use this resource versi .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-overwrite\fP=false @@ -89,7 +89,7 @@ If \-\-resource\-version is specified, then updates will use this resource versi .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-logs.1 b/docs/man/man1/kubectl-logs.1 index 09438b70d98..7a2ebb59024 100644 --- a/docs/man/man1/kubectl-logs.1 +++ b/docs/man/man1/kubectl-logs.1 @@ -61,7 +61,7 @@ Print the logs for a container in a pod. If the pod has only one container, the .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-namespace.1 b/docs/man/man1/kubectl-namespace.1 index 7a5bbff2b88..8e67defa630 100644 --- a/docs/man/man1/kubectl-namespace.1 +++ b/docs/man/man1/kubectl-namespace.1 @@ -26,7 +26,7 @@ namespace has been superseded by the context.namespace field of .kubeconfig file .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-patch.1 b/docs/man/man1/kubectl-patch.1 index bf506f95c2d..2d39770ee30 100644 --- a/docs/man/man1/kubectl-patch.1 +++ b/docs/man/man1/kubectl-patch.1 @@ -52,7 +52,7 @@ Please refer to the models in .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-port-forward.1 b/docs/man/man1/kubectl-port-forward.1 index 89f23d15cbf..665615f4c84 100644 --- a/docs/man/man1/kubectl-port-forward.1 +++ b/docs/man/man1/kubectl-port-forward.1 @@ -29,7 +29,7 @@ Forward one or more local ports to a pod. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-proxy.1 b/docs/man/man1/kubectl-proxy.1 index b0ade8ce144..3b20d0f1146 100644 --- a/docs/man/man1/kubectl-proxy.1 +++ b/docs/man/man1/kubectl-proxy.1 @@ -90,7 +90,7 @@ The above lets you 'curl localhost:8001/custom/api/v1/pods' .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-replace.1 b/docs/man/man1/kubectl-replace.1 index c6990b51ad0..fe8bdecfc56 100644 --- a/docs/man/man1/kubectl-replace.1 +++ b/docs/man/man1/kubectl-replace.1 @@ -74,7 +74,7 @@ Please refer to the models in .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rolling-update.1 b/docs/man/man1/kubectl-rolling-update.1 index 6c93c72d460..f64dea30bee 100644 --- a/docs/man/man1/kubectl-rolling-update.1 +++ b/docs/man/man1/kubectl-rolling-update.1 @@ -54,7 +54,7 @@ existing replication controller and overwrite at least one (common) label in its .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-poll\-interval\fP=3s @@ -105,7 +105,7 @@ existing replication controller and overwrite at least one (common) label in its .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rollout-history.1 b/docs/man/man1/kubectl-rollout-history.1 index 899d581660f..7f9d5b3aa62 100644 --- a/docs/man/man1/kubectl-rollout-history.1 +++ b/docs/man/man1/kubectl-rollout-history.1 @@ -33,7 +33,7 @@ view previous rollout revisions and configurations. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rollout-pause.1 b/docs/man/man1/kubectl-rollout-pause.1 index ec83fce3414..af42e5826ff 100644 --- a/docs/man/man1/kubectl-rollout-pause.1 +++ b/docs/man/man1/kubectl-rollout-pause.1 @@ -34,7 +34,7 @@ Currently only deployments support being paused. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rollout-resume.1 b/docs/man/man1/kubectl-rollout-resume.1 index 1b436d02d0c..8509571629e 100644 --- a/docs/man/man1/kubectl-rollout-resume.1 +++ b/docs/man/man1/kubectl-rollout-resume.1 @@ -34,7 +34,7 @@ Currently only deployments support being resumed. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rollout-undo.1 b/docs/man/man1/kubectl-rollout-undo.1 index b5127295507..84769c2d0a3 100644 --- a/docs/man/man1/kubectl-rollout-undo.1 +++ b/docs/man/man1/kubectl-rollout-undo.1 @@ -33,7 +33,7 @@ undo rolls back to a previous rollout. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-rollout.1 b/docs/man/man1/kubectl-rollout.1 index 19ef9d08e8c..5bf9c5bb6dc 100644 --- a/docs/man/man1/kubectl-rollout.1 +++ b/docs/man/man1/kubectl-rollout.1 @@ -23,7 +23,7 @@ rollout manages a deployment using subcommands like "kubectl rollout undo deploy .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-run.1 b/docs/man/man1/kubectl-run.1 index afb58809058..382785f3e1d 100644 --- a/docs/man/man1/kubectl-run.1 +++ b/docs/man/man1/kubectl-run.1 @@ -74,7 +74,7 @@ Creates a deployment or job to manage the created container(s). .PP \fB\-\-output\-version\fP="" - Output the formatted object with the given version (default api\-version). + Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). .PP \fB\-\-overrides\fP="" @@ -149,7 +149,7 @@ Creates a deployment or job to manage the created container(s). .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-scale.1 b/docs/man/man1/kubectl-scale.1 index 1e3fbc7ac1b..9c8374928e4 100644 --- a/docs/man/man1/kubectl-scale.1 +++ b/docs/man/man1/kubectl-scale.1 @@ -59,7 +59,7 @@ scale is sent to the server. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-stop.1 b/docs/man/man1/kubectl-stop.1 index 3d4da5aa54e..98e6c0cdf0b 100644 --- a/docs/man/man1/kubectl-stop.1 +++ b/docs/man/man1/kubectl-stop.1 @@ -61,7 +61,7 @@ If the resource is scalable it will be scaled to 0 before deletion. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-uncordon.1 b/docs/man/man1/kubectl-uncordon.1 index 62a9b855421..1edac1922fd 100644 --- a/docs/man/man1/kubectl-uncordon.1 +++ b/docs/man/man1/kubectl-uncordon.1 @@ -23,7 +23,7 @@ Mark node as schedulable. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl-version.1 b/docs/man/man1/kubectl-version.1 index 8791f64d35c..f1e49ec2252 100644 --- a/docs/man/man1/kubectl-version.1 +++ b/docs/man/man1/kubectl-version.1 @@ -29,7 +29,7 @@ Print the client and server version information. .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/man/man1/kubectl.1 b/docs/man/man1/kubectl.1 index 2ab31b4c00a..c887f007e23 100644 --- a/docs/man/man1/kubectl.1 +++ b/docs/man/man1/kubectl.1 @@ -27,7 +27,7 @@ Find more information at .PP \fB\-\-api\-version\fP="" - The API version to use when talking to the server + DEPRECATED: The API version to use when talking to the server .PP \fB\-\-certificate\-authority\fP="" diff --git a/docs/user-guide/kubectl/kubectl.md b/docs/user-guide/kubectl/kubectl.md index b08a8e2754a..bd124aba61b 100644 --- a/docs/user-guide/kubectl/kubectl.md +++ b/docs/user-guide/kubectl/kubectl.md @@ -51,7 +51,6 @@ kubectl ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -109,7 +108,7 @@ kubectl * [kubectl uncordon](kubectl_uncordon.md) - Mark node as schedulable * [kubectl version](kubectl_version.md) - Print the client and server version information. -###### Auto generated by spf13/cobra on 19-Jan-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_annotate.md b/docs/user-guide/kubectl/kubectl_annotate.md index e0503072ddc..5772e73d104 100644 --- a/docs/user-guide/kubectl/kubectl_annotate.md +++ b/docs/user-guide/kubectl/kubectl_annotate.md @@ -86,7 +86,7 @@ kubectl annotate pods foo description- -f, --filename=[]: Filename, directory, or URL to a file identifying the resource to update the annotation --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --overwrite[=false]: If true, allow annotations to be overwritten, otherwise reject annotation updates that overwrite existing annotations. --record[=false]: Record current kubectl command in the resource annotation. --resource-version="": If non-empty, the annotation update will only succeed if this is the current resource-version for the object. Only valid when specifying a single resource. @@ -101,7 +101,6 @@ kubectl annotate pods foo description- ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -129,7 +128,7 @@ kubectl annotate pods foo description- * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_annotate.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_api-versions.md b/docs/user-guide/kubectl/kubectl_api-versions.md index ddbeb384ccc..05ac7c23043 100644 --- a/docs/user-guide/kubectl/kubectl_api-versions.md +++ b/docs/user-guide/kubectl/kubectl_api-versions.md @@ -49,7 +49,6 @@ kubectl api-versions ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -77,7 +76,7 @@ kubectl api-versions * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_api-versions.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_apply.md b/docs/user-guide/kubectl/kubectl_apply.md index 73b6c033780..c7617e5e35f 100644 --- a/docs/user-guide/kubectl/kubectl_apply.md +++ b/docs/user-guide/kubectl/kubectl_apply.md @@ -72,7 +72,6 @@ cat pod.json | kubectl apply -f - ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -100,7 +99,7 @@ cat pod.json | kubectl apply -f - * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_apply.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_attach.md b/docs/user-guide/kubectl/kubectl_attach.md index 6bcf7a5ba0f..f4c648eb78e 100644 --- a/docs/user-guide/kubectl/kubectl_attach.md +++ b/docs/user-guide/kubectl/kubectl_attach.md @@ -71,7 +71,6 @@ kubectl attach 123456-7890 -c ruby-container -i -t ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -99,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 on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![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_autoscale.md b/docs/user-guide/kubectl/kubectl_autoscale.md index a0b9e1f0f0b..4f6e709d13c 100644 --- a/docs/user-guide/kubectl/kubectl_autoscale.md +++ b/docs/user-guide/kubectl/kubectl_autoscale.md @@ -70,7 +70,7 @@ kubectl autoscale rc foo --max=5 --cpu-percent=80 --name="": The name for the newly created object. If not specified, the name of the input resource will be used. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --record[=false]: Record current kubectl command in the resource annotation. --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -83,7 +83,6 @@ kubectl autoscale rc foo --max=5 --cpu-percent=80 ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -111,7 +110,7 @@ kubectl autoscale rc foo --max=5 --cpu-percent=80 * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_autoscale.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_cluster-info.md b/docs/user-guide/kubectl/kubectl_cluster-info.md index ebeef184b8d..6868cdc60de 100644 --- a/docs/user-guide/kubectl/kubectl_cluster-info.md +++ b/docs/user-guide/kubectl/kubectl_cluster-info.md @@ -49,7 +49,6 @@ kubectl cluster-info ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -77,7 +76,7 @@ kubectl cluster-info * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_cluster-info.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config.md b/docs/user-guide/kubectl/kubectl_config.md index 2d988f175f5..7cbc7b6fc74 100644 --- a/docs/user-guide/kubectl/kubectl_config.md +++ b/docs/user-guide/kubectl/kubectl_config.md @@ -42,9 +42,9 @@ config modifies kubeconfig files config modifies kubeconfig files using subcommands like "kubectl config set current-context my-context" The loading order follows these rules: - 1. If the --kubeconfig flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. - 2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. - 3. Otherwise, ${HOME}/.kube/config is used and no merging takes place. +1. If the --kubeconfig flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. +2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. +3. Otherwise, ${HOME}/.kube/config is used and no merging takes place. ``` @@ -61,7 +61,6 @@ kubectl config SUBCOMMAND ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -96,7 +95,7 @@ kubectl config SUBCOMMAND * [kubectl config use-context](kubectl_config_use-context.md) - Sets the current-context in a kubeconfig file * [kubectl config view](kubectl_config_view.md) - Displays merged kubeconfig settings or a specified kubeconfig file. -###### Auto generated by spf13/cobra on 9-Jan-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_current-context.md b/docs/user-guide/kubectl/kubectl_config_current-context.md index 84c69670792..256e4a36c08 100644 --- a/docs/user-guide/kubectl/kubectl_config_current-context.md +++ b/docs/user-guide/kubectl/kubectl_config_current-context.md @@ -56,7 +56,6 @@ kubectl config current-context ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -84,7 +83,7 @@ kubectl config current-context * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_current-context.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_set-cluster.md b/docs/user-guide/kubectl/kubectl_config_set-cluster.md index f7750ee3854..efe7b1c127b 100644 --- a/docs/user-guide/kubectl/kubectl_config_set-cluster.md +++ b/docs/user-guide/kubectl/kubectl_config_set-cluster.md @@ -43,7 +43,7 @@ Sets a cluster entry in kubeconfig. Specifying a name that already exists will merge new fields on top of existing values for those fields. ``` -kubectl config set-cluster NAME [--server=server] [--certificate-authority=path/to/certficate/authority] [--api-version=apiversion] [--insecure-skip-tls-verify=true] +kubectl config set-cluster NAME [--server=server] [--certificate-authority=path/to/certficate/authority] [--insecure-skip-tls-verify=true] ``` ### Examples @@ -97,7 +97,7 @@ kubectl config set-cluster e2e --insecure-skip-tls-verify=true * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_set-cluster.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_set-context.md b/docs/user-guide/kubectl/kubectl_config_set-context.md index 926bd0ff0f2..c4f8bb8a2a0 100644 --- a/docs/user-guide/kubectl/kubectl_config_set-context.md +++ b/docs/user-guide/kubectl/kubectl_config_set-context.md @@ -65,7 +65,6 @@ kubectl config set-context gce --user=cluster-admin ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -90,7 +89,7 @@ kubectl config set-context gce --user=cluster-admin * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_set-context.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_set-credentials.md b/docs/user-guide/kubectl/kubectl_config_set-credentials.md index ca7fb7c7e5d..fb28c0a4c0e 100644 --- a/docs/user-guide/kubectl/kubectl_config_set-credentials.md +++ b/docs/user-guide/kubectl/kubectl_config_set-credentials.md @@ -87,7 +87,6 @@ kubectl config set-credentials cluster-admin --client-certificate=~/.kube/admin. ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --cluster="": The name of the kubeconfig cluster to use --context="": The name of the kubeconfig context to use @@ -110,7 +109,7 @@ kubectl config set-credentials cluster-admin --client-certificate=~/.kube/admin. * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_set-credentials.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_set.md b/docs/user-guide/kubectl/kubectl_config_set.md index ccc82212cc4..8c696ac85ed 100644 --- a/docs/user-guide/kubectl/kubectl_config_set.md +++ b/docs/user-guide/kubectl/kubectl_config_set.md @@ -51,7 +51,6 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -79,7 +78,7 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_set.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_unset.md b/docs/user-guide/kubectl/kubectl_config_unset.md index 720868870da..0309390b279 100644 --- a/docs/user-guide/kubectl/kubectl_config_unset.md +++ b/docs/user-guide/kubectl/kubectl_config_unset.md @@ -50,7 +50,6 @@ kubectl config unset PROPERTY_NAME ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -78,7 +77,7 @@ kubectl config unset PROPERTY_NAME * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_unset.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_use-context.md b/docs/user-guide/kubectl/kubectl_config_use-context.md index ad5c3a599dd..39f7ea233a5 100644 --- a/docs/user-guide/kubectl/kubectl_config_use-context.md +++ b/docs/user-guide/kubectl/kubectl_config_use-context.md @@ -49,7 +49,6 @@ kubectl config use-context CONTEXT_NAME ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -77,7 +76,7 @@ kubectl config use-context CONTEXT_NAME * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_use-context.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_config_view.md b/docs/user-guide/kubectl/kubectl_config_view.md index b392310a016..f34f119553b 100644 --- a/docs/user-guide/kubectl/kubectl_config_view.md +++ b/docs/user-guide/kubectl/kubectl_config_view.md @@ -65,7 +65,7 @@ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}' --minify[=false]: remove all information not used by current-context from the output --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --raw[=false]: display raw byte data -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) --show-labels[=false]: When printing, show all labels as the last column (default hide labels column) @@ -77,7 +77,6 @@ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}' ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -105,7 +104,7 @@ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}' * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_view.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_convert.md b/docs/user-guide/kubectl/kubectl_convert.md index 2a1c0db40c7..cde025d80e5 100644 --- a/docs/user-guide/kubectl/kubectl_convert.md +++ b/docs/user-guide/kubectl/kubectl_convert.md @@ -76,7 +76,7 @@ kubectl convert -f . | kubectl create -f - --local[=true]: If true, convert will NOT try to contact api-server but run locally. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) --show-labels[=false]: When printing, show all labels as the last column (default hide labels column) @@ -89,7 +89,6 @@ kubectl convert -f . | kubectl create -f - ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -117,7 +116,7 @@ kubectl convert -f . | kubectl create -f - * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_convert.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_cordon.md b/docs/user-guide/kubectl/kubectl_cordon.md index 0e1c87ce788..3c89b3ba6fa 100644 --- a/docs/user-guide/kubectl/kubectl_cordon.md +++ b/docs/user-guide/kubectl/kubectl_cordon.md @@ -58,7 +58,6 @@ kubectl cordon foo ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -86,7 +85,7 @@ kubectl cordon foo * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_cordon.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create.md b/docs/user-guide/kubectl/kubectl_create.md index d9f2f50aa74..c9077bfa8e7 100644 --- a/docs/user-guide/kubectl/kubectl_create.md +++ b/docs/user-guide/kubectl/kubectl_create.md @@ -72,7 +72,6 @@ cat pod.json | kubectl create -f - ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -104,7 +103,7 @@ cat pod.json | kubectl create -f - * [kubectl create secret](kubectl_create_secret.md) - Create a secret using specified subcommand. * [kubectl create serviceaccount](kubectl_create_serviceaccount.md) - Create a service account with the specified name. -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_configmap.md b/docs/user-guide/kubectl/kubectl_create_configmap.md index b0ac88dff12..0075f06a6ca 100644 --- a/docs/user-guide/kubectl/kubectl_create_configmap.md +++ b/docs/user-guide/kubectl/kubectl_create_configmap.md @@ -77,7 +77,7 @@ kubectl create configmap NAME [--type=string] [--from-file=[key=]source] [--from --generator="configmap/v1": The name of the API generator to use. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -91,7 +91,6 @@ kubectl create configmap NAME [--type=string] [--from-file=[key=]source] [--from ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -119,7 +118,7 @@ kubectl create configmap NAME [--type=string] [--from-file=[key=]source] [--from * [kubectl create](kubectl_create.md) - Create a resource by filename or stdin -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_configmap.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_namespace.md b/docs/user-guide/kubectl/kubectl_create_namespace.md index 1f75ebd1ef4..8b33d3f38c6 100644 --- a/docs/user-guide/kubectl/kubectl_create_namespace.md +++ b/docs/user-guide/kubectl/kubectl_create_namespace.md @@ -60,7 +60,7 @@ kubectl create namespace NAME [--dry-run] --generator="namespace/v1": The name of the API generator to use. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -74,7 +74,6 @@ kubectl create namespace NAME [--dry-run] ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -102,7 +101,7 @@ kubectl create namespace NAME [--dry-run] * [kubectl create](kubectl_create.md) - Create a resource by filename or stdin -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_namespace.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_secret.md b/docs/user-guide/kubectl/kubectl_create_secret.md index c812e389e5e..d8cb84d145d 100644 --- a/docs/user-guide/kubectl/kubectl_create_secret.md +++ b/docs/user-guide/kubectl/kubectl_create_secret.md @@ -49,7 +49,6 @@ kubectl create secret ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -79,7 +78,7 @@ kubectl create secret * [kubectl create secret docker-registry](kubectl_create_secret_docker-registry.md) - Create a secret for use with a Docker registry. * [kubectl create secret generic](kubectl_create_secret_generic.md) - Create a secret from a local file, directory or literal value. -###### Auto generated by spf13/cobra on 14-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_secret.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md b/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md index 17604eacd9f..6119f31eaae 100644 --- a/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md +++ b/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md @@ -75,7 +75,7 @@ kubectl create secret docker-registry NAME --docker-username=user --docker-passw --generator="secret-for-docker-registry/v1": The name of the API generator to use. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -89,7 +89,6 @@ kubectl create secret docker-registry NAME --docker-username=user --docker-passw ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -117,7 +116,7 @@ kubectl create secret docker-registry NAME --docker-username=user --docker-passw * [kubectl create secret](kubectl_create_secret.md) - Create a secret using specified subcommand. -###### Auto generated by spf13/cobra on 14-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_secret_generic.md b/docs/user-guide/kubectl/kubectl_create_secret_generic.md index 9be838d395f..b41611a249b 100644 --- a/docs/user-guide/kubectl/kubectl_create_secret_generic.md +++ b/docs/user-guide/kubectl/kubectl_create_secret_generic.md @@ -78,7 +78,7 @@ kubectl create secret generic NAME [--type=string] [--from-file=[key=]source] [- --generator="secret/v1": The name of the API generator to use. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -93,7 +93,6 @@ kubectl create secret generic NAME [--type=string] [--from-file=[key=]source] [- ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -121,7 +120,7 @@ kubectl create secret generic NAME [--type=string] [--from-file=[key=]source] [- * [kubectl create secret](kubectl_create_secret.md) - Create a secret using specified subcommand. -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_secret_generic.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_create_serviceaccount.md b/docs/user-guide/kubectl/kubectl_create_serviceaccount.md index 6a28488cca2..14b16478256 100644 --- a/docs/user-guide/kubectl/kubectl_create_serviceaccount.md +++ b/docs/user-guide/kubectl/kubectl_create_serviceaccount.md @@ -60,7 +60,7 @@ kubectl create serviceaccount NAME [--dry-run] --generator="serviceaccount/v1": The name of the API generator to use. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) @@ -74,7 +74,6 @@ kubectl create serviceaccount NAME [--dry-run] ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -102,7 +101,7 @@ kubectl create serviceaccount NAME [--dry-run] * [kubectl create](kubectl_create.md) - Create a resource by filename or stdin -###### Auto generated by spf13/cobra on 17-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_create_serviceaccount.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_delete.md b/docs/user-guide/kubectl/kubectl_delete.md index fdb65cee5b3..a9e631a7ef0 100644 --- a/docs/user-guide/kubectl/kubectl_delete.md +++ b/docs/user-guide/kubectl/kubectl_delete.md @@ -92,7 +92,6 @@ kubectl delete pods --all ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -120,7 +119,7 @@ kubectl delete pods --all * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_delete.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_describe.md b/docs/user-guide/kubectl/kubectl_describe.md index cb6872b7c40..1b0ce3013d8 100644 --- a/docs/user-guide/kubectl/kubectl_describe.md +++ b/docs/user-guide/kubectl/kubectl_describe.md @@ -93,7 +93,6 @@ kubectl describe pods frontend ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -121,7 +120,7 @@ kubectl describe pods frontend * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_describe.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_drain.md b/docs/user-guide/kubectl/kubectl_drain.md index 4a97587beff..5c9e07821eb 100644 --- a/docs/user-guide/kubectl/kubectl_drain.md +++ b/docs/user-guide/kubectl/kubectl_drain.md @@ -81,7 +81,6 @@ $ kubectl drain foo --grace-period=900 ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -109,7 +108,7 @@ $ kubectl drain foo --grace-period=900 * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 2-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_drain.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_edit.md b/docs/user-guide/kubectl/kubectl_edit.md index bded4dbbc77..350c6893acf 100644 --- a/docs/user-guide/kubectl/kubectl_edit.md +++ b/docs/user-guide/kubectl/kubectl_edit.md @@ -81,7 +81,7 @@ kubectl edit (RESOURCE/NAME | -f FILENAME) ``` -f, --filename=[]: Filename, directory, or URL to file to use to edit the resource -o, --output="yaml": Output format. One of: yaml|json. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --record[=false]: Record current kubectl command in the resource annotation. --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future. --windows-line-endings[=false]: Use Windows line-endings (default Unix line-endings) @@ -91,7 +91,6 @@ kubectl edit (RESOURCE/NAME | -f FILENAME) ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -119,7 +118,7 @@ kubectl edit (RESOURCE/NAME | -f FILENAME) * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_edit.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_exec.md b/docs/user-guide/kubectl/kubectl_exec.md index 4ad11d50aec..96e4b66b5d3 100644 --- a/docs/user-guide/kubectl/kubectl_exec.md +++ b/docs/user-guide/kubectl/kubectl_exec.md @@ -72,7 +72,6 @@ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -100,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 on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![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_explain.md b/docs/user-guide/kubectl/kubectl_explain.md index b3cdca50deb..25582762a0e 100644 --- a/docs/user-guide/kubectl/kubectl_explain.md +++ b/docs/user-guide/kubectl/kubectl_explain.md @@ -71,7 +71,6 @@ kubectl explain pods.spec.containers ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -99,7 +98,7 @@ kubectl explain pods.spec.containers * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_explain.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_expose.md b/docs/user-guide/kubectl/kubectl_expose.md index a3fbcc1b34b..bb100730ad6 100644 --- a/docs/user-guide/kubectl/kubectl_expose.md +++ b/docs/user-guide/kubectl/kubectl_expose.md @@ -87,7 +87,7 @@ kubectl expose rs nginx --port=80 --target-port=8000 --name="": The name for the newly created object. --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --overrides="": An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field. --port="": The port that the service should serve on. Copied from the resource being exposed, if unspecified --protocol="TCP": The network protocol for the service to be created. Default is 'tcp'. @@ -107,7 +107,6 @@ kubectl expose rs nginx --port=80 --target-port=8000 ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -135,7 +134,7 @@ kubectl expose rs nginx --port=80 --target-port=8000 * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_expose.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_get.md b/docs/user-guide/kubectl/kubectl_get.md index c2c709faa7b..05b7ae25b72 100644 --- a/docs/user-guide/kubectl/kubectl_get.md +++ b/docs/user-guide/kubectl/kubectl_get.md @@ -73,7 +73,7 @@ kubectl get -o json pod web-pod-13je7 kubectl get -f pod.yaml -o json # Return only the phase value of the specified pod. -kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}} --api-version=v1 +kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}} # List all replication controllers and services together in ps output format. kubectl get rc,services @@ -91,7 +91,7 @@ kubectl get rc/web service/frontend pods/web-pod-13je7 -L, --label-columns=[]: Accepts a comma separated list of labels that are going to be presented as columns. Names are case-sensitive. You can also use multiple flag statements like -L label1 -L label2... --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). -l, --selector="": Selector (label query) to filter on -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) --show-labels[=false]: When printing, show all labels as the last column (default hide labels column) @@ -105,7 +105,6 @@ kubectl get rc/web service/frontend pods/web-pod-13je7 ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -133,7 +132,7 @@ kubectl get rc/web service/frontend pods/web-pod-13je7 * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_get.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_label.md b/docs/user-guide/kubectl/kubectl_label.md index a8fcd90a8fa..370a150632c 100644 --- a/docs/user-guide/kubectl/kubectl_label.md +++ b/docs/user-guide/kubectl/kubectl_label.md @@ -80,7 +80,7 @@ kubectl label pods foo bar- -f, --filename=[]: Filename, directory, or URL to a file identifying the resource to update the labels --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --overwrite[=false]: If true, allow labels to be overwritten, otherwise reject label updates that overwrite existing labels. --record[=false]: Record current kubectl command in the resource annotation. --resource-version="": If non-empty, the labels update will only succeed if this is the current resource-version for the object. Only valid when specifying a single resource. @@ -95,7 +95,6 @@ kubectl label pods foo bar- ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -123,7 +122,7 @@ kubectl label pods foo bar- * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_label.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_logs.md b/docs/user-guide/kubectl/kubectl_logs.md index 8b332653534..e0892a9980a 100644 --- a/docs/user-guide/kubectl/kubectl_logs.md +++ b/docs/user-guide/kubectl/kubectl_logs.md @@ -81,7 +81,6 @@ kubectl logs --since=1h nginx ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -109,7 +108,7 @@ kubectl logs --since=1h nginx * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_logs.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_namespace.md b/docs/user-guide/kubectl/kubectl_namespace.md index a92597118bd..dd347557396 100644 --- a/docs/user-guide/kubectl/kubectl_namespace.md +++ b/docs/user-guide/kubectl/kubectl_namespace.md @@ -52,7 +52,6 @@ kubectl namespace [namespace] ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -80,7 +79,7 @@ kubectl namespace [namespace] * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_namespace.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_patch.md b/docs/user-guide/kubectl/kubectl_patch.md index 317ba2dc4b0..99d48d2ee4a 100644 --- a/docs/user-guide/kubectl/kubectl_patch.md +++ b/docs/user-guide/kubectl/kubectl_patch.md @@ -80,7 +80,6 @@ kubectl patch pod valid-pod -type='json' -p='[{"op": "replace", "path": "/spec/c ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -108,7 +107,7 @@ kubectl patch pod valid-pod -type='json' -p='[{"op": "replace", "path": "/spec/c * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 12-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_patch.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_port-forward.md b/docs/user-guide/kubectl/kubectl_port-forward.md index a52609b874a..8e971d2c72b 100644 --- a/docs/user-guide/kubectl/kubectl_port-forward.md +++ b/docs/user-guide/kubectl/kubectl_port-forward.md @@ -72,7 +72,6 @@ kubectl port-forward mypod 0:5000 ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -100,7 +99,7 @@ kubectl port-forward mypod 0:5000 * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_port-forward.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_proxy.md b/docs/user-guide/kubectl/kubectl_proxy.md index 412679aa3e0..462e301c742 100644 --- a/docs/user-guide/kubectl/kubectl_proxy.md +++ b/docs/user-guide/kubectl/kubectl_proxy.md @@ -95,7 +95,6 @@ kubectl proxy --api-prefix=/k8s-api ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -123,7 +122,7 @@ kubectl proxy --api-prefix=/k8s-api * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_proxy.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_replace.md b/docs/user-guide/kubectl/kubectl_replace.md index 185664d355f..764f8c0cb50 100644 --- a/docs/user-guide/kubectl/kubectl_replace.md +++ b/docs/user-guide/kubectl/kubectl_replace.md @@ -86,7 +86,6 @@ kubectl replace --force -f ./pod.json ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -114,7 +113,7 @@ kubectl replace --force -f ./pod.json * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_replace.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rolling-update.md b/docs/user-guide/kubectl/kubectl_rolling-update.md index 1e3ffb0de05..81dbaec25b1 100644 --- a/docs/user-guide/kubectl/kubectl_rolling-update.md +++ b/docs/user-guide/kubectl/kubectl_rolling-update.md @@ -80,7 +80,7 @@ kubectl rolling-update frontend-v1 frontend-v2 --rollback --image="": Image to use for upgrading the replication controller. Must be distinct from the existing image (either new image or new image tag). Can not be used with --filename/-f --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --poll-interval=3s: Time delay between polling for replication controller status after the update. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". --rollback[=false]: If true, this is a request to abort an existing rollout that is partially rolled out. It effectively reverses current and next and runs a rollout --schema-cache-dir="~/.kube/schema": If non-empty, load/store cached API schemas in this directory, default is '$HOME/.kube/schema' @@ -97,7 +97,6 @@ kubectl rolling-update frontend-v1 frontend-v2 --rollback ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -125,7 +124,7 @@ kubectl rolling-update frontend-v1 frontend-v2 --rollback * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rolling-update.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rollout.md b/docs/user-guide/kubectl/kubectl_rollout.md index 1c40f8e847d..e9ee52ddaeb 100644 --- a/docs/user-guide/kubectl/kubectl_rollout.md +++ b/docs/user-guide/kubectl/kubectl_rollout.md @@ -56,7 +56,6 @@ kubectl rollout undo deployment/abc ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -88,7 +87,7 @@ kubectl rollout undo deployment/abc * [kubectl rollout resume](kubectl_rollout_resume.md) - Resume a paused resource * [kubectl rollout undo](kubectl_rollout_undo.md) - undoes a previous rollout -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rollout.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rollout_history.md b/docs/user-guide/kubectl/kubectl_rollout_history.md index 1753d5eb7ac..95a91f6d2ac 100644 --- a/docs/user-guide/kubectl/kubectl_rollout_history.md +++ b/docs/user-guide/kubectl/kubectl_rollout_history.md @@ -63,7 +63,6 @@ kubectl rollout history deployment/abc ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -91,7 +90,7 @@ kubectl rollout history deployment/abc * [kubectl rollout](kubectl_rollout.md) - rollout manages a deployment -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rollout_history.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rollout_pause.md b/docs/user-guide/kubectl/kubectl_rollout_pause.md index 7034e30be14..558a0fd26ae 100644 --- a/docs/user-guide/kubectl/kubectl_rollout_pause.md +++ b/docs/user-guide/kubectl/kubectl_rollout_pause.md @@ -68,7 +68,6 @@ kubectl rollout pause deployment/nginx ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -96,7 +95,7 @@ kubectl rollout pause deployment/nginx * [kubectl rollout](kubectl_rollout.md) - rollout manages a deployment -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rollout_pause.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rollout_resume.md b/docs/user-guide/kubectl/kubectl_rollout_resume.md index 99a9bd5dd35..fa4338f2487 100644 --- a/docs/user-guide/kubectl/kubectl_rollout_resume.md +++ b/docs/user-guide/kubectl/kubectl_rollout_resume.md @@ -66,7 +66,6 @@ kubectl rollout resume deployment/nginx ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -94,7 +93,7 @@ kubectl rollout resume deployment/nginx * [kubectl rollout](kubectl_rollout.md) - rollout manages a deployment -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rollout_resume.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_rollout_undo.md b/docs/user-guide/kubectl/kubectl_rollout_undo.md index bedf9bfb9c9..118e2fb9293 100644 --- a/docs/user-guide/kubectl/kubectl_rollout_undo.md +++ b/docs/user-guide/kubectl/kubectl_rollout_undo.md @@ -63,7 +63,6 @@ kubectl rollout undo deployment/abc ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -91,7 +90,7 @@ kubectl rollout undo deployment/abc * [kubectl rollout](kubectl_rollout.md) - rollout manages a deployment -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_rollout_undo.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_run.md b/docs/user-guide/kubectl/kubectl_run.md index 7f2366a110c..c6b838efaae 100644 --- a/docs/user-guide/kubectl/kubectl_run.md +++ b/docs/user-guide/kubectl/kubectl_run.md @@ -96,7 +96,7 @@ kubectl run pi --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print --limits="": The resource requirement limits for this container. For example, 'cpu=200m,memory=512Mi' --no-headers[=false]: When using the default output, don't print headers. -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. - --output-version="": Output the formatted object with the given version (default api-version). + --output-version="": Output the formatted object with the given group version (for ex: 'extensions/v1beta1'). --overrides="": An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field. --port=-1: The port that this container exposes. If --expose is true, this is also the port used by the service that is created. --record[=false]: Record current kubectl command in the resource annotation. @@ -119,7 +119,6 @@ kubectl run pi --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. diff --git a/docs/user-guide/kubectl/kubectl_scale.md b/docs/user-guide/kubectl/kubectl_scale.md index d23b5f14b3f..f681e88561b 100644 --- a/docs/user-guide/kubectl/kubectl_scale.md +++ b/docs/user-guide/kubectl/kubectl_scale.md @@ -85,7 +85,6 @@ kubectl scale --replicas=3 job/cron ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -113,7 +112,7 @@ kubectl scale --replicas=3 job/cron * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 29-Feb-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_scale.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_uncordon.md b/docs/user-guide/kubectl/kubectl_uncordon.md index a553f594c2f..58a890f3733 100644 --- a/docs/user-guide/kubectl/kubectl_uncordon.md +++ b/docs/user-guide/kubectl/kubectl_uncordon.md @@ -58,7 +58,6 @@ $ kubectl uncordon foo ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -86,7 +85,7 @@ $ kubectl uncordon foo * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 4-Jan-2016 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_uncordon.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_version.md b/docs/user-guide/kubectl/kubectl_version.md index 3f12d401abe..06acb2a84e6 100644 --- a/docs/user-guide/kubectl/kubectl_version.md +++ b/docs/user-guide/kubectl/kubectl_version.md @@ -55,7 +55,6 @@ kubectl version ``` --alsologtostderr[=false]: log to standard error as well as files - --api-version="": The API version to use when talking to the server --certificate-authority="": Path to a cert. file for the certificate authority. --client-certificate="": Path to a client certificate file for TLS. --client-key="": Path to a client key file for TLS. @@ -83,7 +82,7 @@ kubectl version * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 8-Dec-2015 +###### Auto generated by spf13/cobra on 2-Mar-2016 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_version.md?pixel)]() diff --git a/pkg/client/unversioned/clientcmd/api/types.go b/pkg/client/unversioned/clientcmd/api/types.go index 4a1dc364f43..7e2bfcfa8b8 100644 --- a/pkg/client/unversioned/clientcmd/api/types.go +++ b/pkg/client/unversioned/clientcmd/api/types.go @@ -29,7 +29,11 @@ type Config struct { // Legacy field from pkg/api/types.go TypeMeta. // TODO(jlowdermilk): remove this after eliminating downstream dependencies. Kind string `json:"kind,omitempty"` - // Version of the schema for this config object. + // DEPRECATED: APIVersion is the preferred api version for communicating with the kubernetes cluster (v1, v2, etc). + // Because a cluster can run multiple API groups and potentially multiple versions of each, it no longer makes sense to specify + // a single value for the cluster version. + // This field isnt really needed anyway, so we are deprecating it without replacement. + // It will be ignored if it is present. APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions Preferences Preferences `json:"preferences"` diff --git a/pkg/client/unversioned/clientcmd/api/types_test.go b/pkg/client/unversioned/clientcmd/api/types_test.go index 8059fe21fd1..2de870afad7 100644 --- a/pkg/client/unversioned/clientcmd/api/types_test.go +++ b/pkg/client/unversioned/clientcmd/api/types_test.go @@ -44,13 +44,11 @@ func ExampleOfOptionsConfig() { defaultConfig.Preferences.Colors = true defaultConfig.Clusters["alfa"] = &Cluster{ Server: "https://alfa.org:8080", - APIVersion: "v1", InsecureSkipTLSVerify: true, CertificateAuthority: "path/to/my/cert-ca-filename", } defaultConfig.Clusters["bravo"] = &Cluster{ Server: "https://bravo.org:8080", - APIVersion: "v1", InsecureSkipTLSVerify: false, } defaultConfig.AuthInfos["white-mage-via-cert"] = &AuthInfo{ @@ -86,13 +84,11 @@ func ExampleOfOptionsConfig() { // clusters: // alfa: // LocationOfOrigin: "" - // api-version: v1 // certificate-authority: path/to/my/cert-ca-filename // insecure-skip-tls-verify: true // server: https://alfa.org:8080 // bravo: // LocationOfOrigin: "" - // api-version: v1 // server: https://bravo.org:8080 // contexts: // alfa-as-black-mage: diff --git a/pkg/client/unversioned/clientcmd/api/v1/types.go b/pkg/client/unversioned/clientcmd/api/v1/types.go index e04f1311e4f..c9b4ab56ba4 100644 --- a/pkg/client/unversioned/clientcmd/api/v1/types.go +++ b/pkg/client/unversioned/clientcmd/api/v1/types.go @@ -28,7 +28,11 @@ type Config struct { // Legacy field from pkg/api/types.go TypeMeta. // TODO(jlowdermilk): remove this after eliminating downstream dependencies. Kind string `json:"kind,omitempty"` - // Version of the schema for this config object. + // DEPRECATED: APIVersion is the preferred api version for communicating with the kubernetes cluster (v1, v2, etc). + // Because a cluster can run multiple API groups and potentially multiple versions of each, it no longer makes sense to specify + // a single value for the cluster version. + // This field isnt really needed anyway, so we are deprecating it without replacement. + // It will be ignored if it is present. APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions Preferences Preferences `json:"preferences"` diff --git a/pkg/client/unversioned/clientcmd/client_config.go b/pkg/client/unversioned/clientcmd/client_config.go index 60a25b9cd45..9ff259edffe 100644 --- a/pkg/client/unversioned/clientcmd/client_config.go +++ b/pkg/client/unversioned/clientcmd/client_config.go @@ -28,7 +28,6 @@ import ( "github.com/imdario/mergo" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/restclient" clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" @@ -100,13 +99,6 @@ func (config *DirectClientConfig) ClientConfig() (*restclient.Config, error) { u.Fragment = "" clientConfig.Host = u.String() } - if len(configClusterInfo.APIVersion) != 0 { - gv, err := unversioned.ParseGroupVersion(configClusterInfo.APIVersion) - if err != nil { - return nil, err - } - clientConfig.GroupVersion = &gv - } // only try to read the auth information if we are secure if restclient.IsConfigTransportTLS(*clientConfig) { diff --git a/pkg/client/unversioned/clientcmd/client_config_test.go b/pkg/client/unversioned/clientcmd/client_config_test.go index bc01c5f3090..c9650ea6d52 100644 --- a/pkg/client/unversioned/clientcmd/client_config_test.go +++ b/pkg/client/unversioned/clientcmd/client_config_test.go @@ -21,7 +21,6 @@ import ( "testing" "github.com/imdario/mergo" - "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/client/restclient" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) @@ -52,8 +51,7 @@ func createValidTestConfig() *clientcmdapi.Config { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ - Server: server, - APIVersion: testapi.Default.GroupVersion().String(), + Server: server, } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ Token: token, @@ -107,8 +105,7 @@ func TestCertificateData(t *testing.T) { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ - Server: "https://localhost:8443", - APIVersion: testapi.Default.GroupVersion().String(), + Server: "https://localhost:8443", CertificateAuthorityData: caData, } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ @@ -140,8 +137,7 @@ func TestBasicAuthData(t *testing.T) { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ - Server: "https://localhost:8443", - APIVersion: testapi.Default.GroupVersion().String(), + Server: "https://localhost:8443", } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ Username: username, @@ -176,7 +172,6 @@ func TestCreateClean(t *testing.T) { matchStringArg(config.Clusters["clean"].Server, clientConfig.Host, t) matchStringArg("", clientConfig.APIPath, t) - matchStringArg(config.Clusters["clean"].APIVersion, clientConfig.GroupVersion.String(), t) matchBoolArg(config.Clusters["clean"].InsecureSkipTLSVerify, clientConfig.Insecure, t) matchStringArg(config.AuthInfos["clean"].Token, clientConfig.BearerToken, t) } @@ -229,7 +224,6 @@ func TestCreateCleanDefault(t *testing.T) { } matchStringArg(config.Clusters["clean"].Server, clientConfig.Host, t) - matchStringArg(config.Clusters["clean"].APIVersion, clientConfig.GroupVersion.String(), t) matchBoolArg(config.Clusters["clean"].InsecureSkipTLSVerify, clientConfig.Insecure, t) matchStringArg(config.AuthInfos["clean"].Token, clientConfig.BearerToken, t) } diff --git a/pkg/client/unversioned/clientcmd/overrides.go b/pkg/client/unversioned/clientcmd/overrides.go index d6bc496a252..9996d2f44af 100644 --- a/pkg/client/unversioned/clientcmd/overrides.go +++ b/pkg/client/unversioned/clientcmd/overrides.go @@ -134,7 +134,7 @@ func RecommendedAuthOverrideFlags(prefix string) AuthOverrideFlags { func RecommendedClusterOverrideFlags(prefix string) ClusterOverrideFlags { return ClusterOverrideFlags{ APIServer: FlagInfo{prefix + FlagAPIServer, "", "", "The address and port of the Kubernetes API server"}, - APIVersion: FlagInfo{prefix + FlagAPIVersion, "", "", "The API version to use when talking to the server"}, + APIVersion: FlagInfo{prefix + FlagAPIVersion, "", "", "DEPRECATED: The API version to use when talking to the server"}, CertificateAuthority: FlagInfo{prefix + FlagCAFile, "", "", "Path to a cert. file for the certificate authority."}, InsecureSkipTLSVerify: FlagInfo{prefix + FlagInsecure, "", "false", "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure."}, } @@ -171,7 +171,9 @@ func BindAuthInfoFlags(authInfo *clientcmdapi.AuthInfo, flags *pflag.FlagSet, fl // BindClusterFlags is a convenience method to bind the specified flags to their associated variables func BindClusterFlags(clusterInfo *clientcmdapi.Cluster, flags *pflag.FlagSet, flagNames ClusterOverrideFlags) { flagNames.APIServer.BindStringFlag(flags, &clusterInfo.Server) + // TODO: remove --api-version flag in 1.3. flagNames.APIVersion.BindStringFlag(flags, &clusterInfo.APIVersion) + flags.MarkDeprecated(FlagAPIVersion, "flag is no longer respected and will be deleted in the next release") flagNames.CertificateAuthority.BindStringFlag(flags, &clusterInfo.CertificateAuthority) flagNames.InsecureSkipTLSVerify.BindBoolFlag(flags, &clusterInfo.InsecureSkipTLSVerify) } diff --git a/pkg/kubectl/cmd/config/config_test.go b/pkg/kubectl/cmd/config/config_test.go index 8f33734a095..523543efe6a 100644 --- a/pkg/kubectl/cmd/config/config_test.go +++ b/pkg/kubectl/cmd/config/config_test.go @@ -27,7 +27,6 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" @@ -584,13 +583,12 @@ func TestNewEmptyCluster(t *testing.T) { func TestAdditionalCluster(t *testing.T) { expectedConfig := newRedFederalCowHammerConfig() cluster := clientcmdapi.NewCluster() - cluster.APIVersion = testapi.Default.GroupVersion().String() cluster.CertificateAuthority = "/ca-location" cluster.InsecureSkipTLSVerify = false cluster.Server = "serverlocation" expectedConfig.Clusters["different-cluster"] = cluster test := configCommandTest{ - args: []string{"set-cluster", "different-cluster", "--" + clientcmd.FlagAPIServer + "=serverlocation", "--" + clientcmd.FlagInsecure + "=false", "--" + clientcmd.FlagCAFile + "=/ca-location", "--" + clientcmd.FlagAPIVersion + "=" + testapi.Default.GroupVersion().String()}, + args: []string{"set-cluster", "different-cluster", "--" + clientcmd.FlagAPIServer + "=serverlocation", "--" + clientcmd.FlagInsecure + "=false", "--" + clientcmd.FlagCAFile + "=/ca-location"}, startingConfig: newRedFederalCowHammerConfig(), expectedConfig: expectedConfig, } diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index 30d15434bde..79edfd0cf37 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -57,7 +57,7 @@ func NewCmdConfigSetCluster(out io.Writer, configAccess ConfigAccess) *cobra.Com options := &createClusterOptions{configAccess: configAccess} cmd := &cobra.Command{ - Use: fmt.Sprintf("set-cluster NAME [--%v=server] [--%v=path/to/certficate/authority] [--%v=apiversion] [--%v=true]", clientcmd.FlagAPIServer, clientcmd.FlagCAFile, clientcmd.FlagAPIVersion, clientcmd.FlagInsecure), + Use: fmt.Sprintf("set-cluster NAME [--%v=server] [--%v=path/to/certficate/authority] [--%v=true]", clientcmd.FlagAPIServer, clientcmd.FlagCAFile, clientcmd.FlagInsecure), Short: "Sets a cluster entry in kubeconfig", Long: create_cluster_long, Example: create_cluster_example, @@ -120,9 +120,6 @@ func (o *createClusterOptions) modifyCluster(existingCluster clientcmdapi.Cluste if o.server.Provided() { modifiedCluster.Server = o.server.Value() } - if o.apiVersion.Provided() { - modifiedCluster.APIVersion = o.apiVersion.Value() - } if o.insecureSkipTLSVerify.Provided() { modifiedCluster.InsecureSkipTLSVerify = o.insecureSkipTLSVerify.Value() // Specifying insecure mode clears any certificate authority diff --git a/pkg/kubectl/cmd/edit.go b/pkg/kubectl/cmd/edit.go index 42b2e9c7cdb..f43a662c76a 100644 --- a/pkg/kubectl/cmd/edit.go +++ b/pkg/kubectl/cmd/edit.go @@ -94,7 +94,7 @@ func NewCmdEdit(f *cmdutil.Factory, out io.Writer) *cobra.Command { usage := "Filename, directory, or URL to file to use to edit the resource" kubectl.AddJsonFilenameFlag(cmd, &filenames, usage) cmd.Flags().StringP("output", "o", "yaml", "Output format. One of: yaml|json.") - cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version).") + cmd.Flags().String("output-version", "", "Output the formatted object with the given group version (for ex: 'extensions/v1beta1').") cmd.Flags().Bool("windows-line-endings", gruntime.GOOS == "windows", "Use Windows line-endings (default Unix line-endings)") cmdutil.AddApplyAnnotationFlags(cmd) cmdutil.AddRecordFlag(cmd) diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 4adfb65742c..5ba06cdbbe5 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -62,7 +62,7 @@ kubectl get -o json pod web-pod-13je7 kubectl get -f pod.yaml -o json # Return only the phase value of the specified pod. -kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}} --api-version=v1 +kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}} # List all replication controllers and services together in ps output format. kubectl get rc,services diff --git a/pkg/kubectl/cmd/util/printing.go b/pkg/kubectl/cmd/util/printing.go index 88af6fa2283..32b394227bc 100644 --- a/pkg/kubectl/cmd/util/printing.go +++ b/pkg/kubectl/cmd/util/printing.go @@ -31,7 +31,7 @@ import ( // AddPrinterFlags adds printing related flags to a command (e.g. output format, no headers, template path) func AddPrinterFlags(cmd *cobra.Command) { cmd.Flags().StringP("output", "o", "", "Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md].") - cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version).") + cmd.Flags().String("output-version", "", "Output the formatted object with the given group version (for ex: 'extensions/v1beta1').") cmd.Flags().Bool("no-headers", false, "When using the default output, don't print headers.") cmd.Flags().Bool("show-labels", false, "When printing, show all labels as the last column (default hide labels column)") // template shorthand -t is deprecated to support -t for --tty