From 5466dd813876e32a4176cd61f2d54268b8756c3d Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 14 Apr 2015 12:52:28 -0700 Subject: [PATCH 1/2] hack: reliable sort in util.sh --- hack/lib/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 89f9c20e311..abc786fa12b 100644 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -138,7 +138,7 @@ kube::util::gen-doc() { # generate the new files ${cmd} "${tmpdir}" # create the list of generated files - ls "${tmpdir}" | sort > "${tmpdir}/.files_generated" + ls "${tmpdir}" | LC_ALL=C sort > "${tmpdir}/.files_generated" # put the new generated file into the destination find "${tmpdir}" -exec rsync -pt {} "${dest}" \; >/dev/null #cleanup From 5f4b2f5551cc7e586c856b0a4ff317aabd0355ff Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 14 Apr 2015 12:53:37 -0700 Subject: [PATCH 2/2] docs: generate docs --- docs/.files_generated | 2 +- docs/kubectl.md | 2 +- docs/kubectl_api-versions.md | 2 +- docs/kubectl_cluster-info.md | 2 +- docs/kubectl_config.md | 2 +- docs/kubectl_config_set-cluster.md | 2 +- docs/kubectl_config_set-context.md | 2 +- docs/kubectl_config_set-credentials.md | 2 +- docs/kubectl_config_set.md | 2 +- docs/kubectl_config_unset.md | 2 +- docs/kubectl_config_use-context.md | 2 +- docs/kubectl_config_view.md | 2 +- docs/kubectl_create.md | 2 +- docs/kubectl_delete.md | 2 +- docs/kubectl_describe.md | 2 +- docs/kubectl_exec.md | 2 +- docs/kubectl_expose.md | 2 +- docs/kubectl_get.md | 2 +- docs/kubectl_label.md | 2 +- docs/kubectl_log.md | 2 +- docs/kubectl_namespace.md | 2 +- docs/kubectl_port-forward.md | 2 +- docs/kubectl_proxy.md | 2 +- docs/kubectl_resize.md | 2 +- docs/kubectl_rolling-update.md | 2 +- docs/kubectl_run-container.md | 2 +- docs/kubectl_stop.md | 2 +- docs/kubectl_update.md | 2 +- docs/kubectl_version.md | 2 +- docs/man/man1/.files_generated | 6 +++--- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/.files_generated b/docs/.files_generated index 97a088317a3..2b5aff7b6f6 100644 --- a/docs/.files_generated +++ b/docs/.files_generated @@ -1,3 +1,4 @@ +kubectl.md kubectl_api-versions.md kubectl_cluster-info.md kubectl_config.md @@ -16,7 +17,6 @@ kubectl_expose.md kubectl_get.md kubectl_label.md kubectl_log.md -kubectl.md kubectl_namespace.md kubectl_port-forward.md kubectl_proxy.md diff --git a/docs/kubectl.md b/docs/kubectl.md index 85f24ac6f07..081d485c76b 100644 --- a/docs/kubectl.md +++ b/docs/kubectl.md @@ -66,4 +66,4 @@ kubectl * [kubectl update](kubectl_update.md) - Update a resource by filename or stdin. * [kubectl version](kubectl_version.md) - Print the client and server version information. -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.453079685 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.641789142 +0000 UTC diff --git a/docs/kubectl_api-versions.md b/docs/kubectl_api-versions.md index 71e2a60f412..864b501c4fb 100644 --- a/docs/kubectl_api-versions.md +++ b/docs/kubectl_api-versions.md @@ -50,4 +50,4 @@ kubectl api-versions ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452805417 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.641051929 +0000 UTC diff --git a/docs/kubectl_cluster-info.md b/docs/kubectl_cluster-info.md index f4cca1a4788..36d58907624 100644 --- a/docs/kubectl_cluster-info.md +++ b/docs/kubectl_cluster-info.md @@ -50,4 +50,4 @@ kubectl cluster-info ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452687658 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.640723377 +0000 UTC diff --git a/docs/kubectl_config.md b/docs/kubectl_config.md index bea2102db2b..70309a1bf77 100644 --- a/docs/kubectl_config.md +++ b/docs/kubectl_config.md @@ -60,4 +60,4 @@ 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 at 2015-04-14 14:22:51.452570294 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.640323684 +0000 UTC diff --git a/docs/kubectl_config_set-cluster.md b/docs/kubectl_config_set-cluster.md index f23b7979ca0..b3aa67a92dc 100644 --- a/docs/kubectl_config_set-cluster.md +++ b/docs/kubectl_config_set-cluster.md @@ -68,4 +68,4 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.451768559 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.637680508 +0000 UTC diff --git a/docs/kubectl_config_set-context.md b/docs/kubectl_config_set-context.md index 62133348b32..689d8511306 100644 --- a/docs/kubectl_config_set-context.md +++ b/docs/kubectl_config_set-context.md @@ -61,4 +61,4 @@ $ kubectl config set-context gce --user=cluster-admin ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452031181 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.638371771 +0000 UTC diff --git a/docs/kubectl_config_set-credentials.md b/docs/kubectl_config_set-credentials.md index e85314bbd6d..2ca6e7b83bf 100644 --- a/docs/kubectl_config_set-credentials.md +++ b/docs/kubectl_config_set-credentials.md @@ -81,4 +81,4 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt - ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.451906112 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.638019407 +0000 UTC diff --git a/docs/kubectl_config_set.md b/docs/kubectl_config_set.md index 8cfd8c372c5..12601a42705 100644 --- a/docs/kubectl_config_set.md +++ b/docs/kubectl_config_set.md @@ -55,4 +55,4 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.45217009 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.638724317 +0000 UTC diff --git a/docs/kubectl_config_unset.md b/docs/kubectl_config_unset.md index 23f135bc4a6..3c9e8d1a604 100644 --- a/docs/kubectl_config_unset.md +++ b/docs/kubectl_config_unset.md @@ -54,4 +54,4 @@ kubectl config unset PROPERTY_NAME ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452318625 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.639325332 +0000 UTC diff --git a/docs/kubectl_config_use-context.md b/docs/kubectl_config_use-context.md index 493a68820a4..600c319d3e0 100644 --- a/docs/kubectl_config_use-context.md +++ b/docs/kubectl_config_use-context.md @@ -53,4 +53,4 @@ kubectl config use-context CONTEXT_NAME ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452447654 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.639859272 +0000 UTC diff --git a/docs/kubectl_config_view.md b/docs/kubectl_config_view.md index 4b193c4c1f9..22dd4f41e14 100644 --- a/docs/kubectl_config_view.md +++ b/docs/kubectl_config_view.md @@ -75,4 +75,4 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2 ### SEE ALSO * [kubectl config](kubectl_config.md) - config modifies kubeconfig files -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.451646336 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.637312729 +0000 UTC diff --git a/docs/kubectl_create.md b/docs/kubectl_create.md index 100406e0e6d..83dcc1d3f2d 100644 --- a/docs/kubectl_create.md +++ b/docs/kubectl_create.md @@ -63,4 +63,4 @@ $ cat pod.json | kubectl create -f - ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.44924428 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.629142674 +0000 UTC diff --git a/docs/kubectl_delete.md b/docs/kubectl_delete.md index fe5f50c86e3..0be8a705296 100644 --- a/docs/kubectl_delete.md +++ b/docs/kubectl_delete.md @@ -81,4 +81,4 @@ $ kubectl delete pods --all ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.449502668 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.630884641 +0000 UTC diff --git a/docs/kubectl_describe.md b/docs/kubectl_describe.md index 2495238e734..545a9152783 100644 --- a/docs/kubectl_describe.md +++ b/docs/kubectl_describe.md @@ -53,4 +53,4 @@ kubectl describe RESOURCE ID ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.449099339 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.628735136 +0000 UTC diff --git a/docs/kubectl_exec.md b/docs/kubectl_exec.md index d0c457f2c55..e48b80570f7 100644 --- a/docs/kubectl_exec.md +++ b/docs/kubectl_exec.md @@ -64,4 +64,4 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.450677119 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.632991694 +0000 UTC diff --git a/docs/kubectl_expose.md b/docs/kubectl_expose.md index 314b3018fec..4aee0a61e27 100644 --- a/docs/kubectl_expose.md +++ b/docs/kubectl_expose.md @@ -82,4 +82,4 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.451362859 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.636399596 +0000 UTC diff --git a/docs/kubectl_get.md b/docs/kubectl_get.md index aab970a4304..8fab6a29ae3 100644 --- a/docs/kubectl_get.md +++ b/docs/kubectl_get.md @@ -85,4 +85,4 @@ $ kubectl get rc/web service/frontend pods/web-pod-13je7 ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.448937009 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.620151758 +0000 UTC diff --git a/docs/kubectl_label.md b/docs/kubectl_label.md index bcff8fa8762..f441d299b8a 100644 --- a/docs/kubectl_label.md +++ b/docs/kubectl_label.md @@ -81,4 +81,4 @@ $ kubectl label pods foo bar- ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.45150424 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.636842283 +0000 UTC diff --git a/docs/kubectl_log.md b/docs/kubectl_log.md index 5d4a098df64..8363949c67f 100644 --- a/docs/kubectl_log.md +++ b/docs/kubectl_log.md @@ -62,4 +62,4 @@ $ kubectl log -f 123456-7890 ruby-container ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.450201574 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.631637812 +0000 UTC diff --git a/docs/kubectl_namespace.md b/docs/kubectl_namespace.md index 46b1dfd2e66..b2e464211ab 100644 --- a/docs/kubectl_namespace.md +++ b/docs/kubectl_namespace.md @@ -53,4 +53,4 @@ kubectl namespace [namespace] ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.449618977 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.63128386 +0000 UTC diff --git a/docs/kubectl_port-forward.md b/docs/kubectl_port-forward.md index 285aefeb7c2..6ca9e5268ed 100644 --- a/docs/kubectl_port-forward.md +++ b/docs/kubectl_port-forward.md @@ -68,4 +68,4 @@ $ kubectl port-forward -p mypod 0:5000 ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.45080362 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.633423694 +0000 UTC diff --git a/docs/kubectl_proxy.md b/docs/kubectl_proxy.md index afd19673efd..5e5084c4a4d 100644 --- a/docs/kubectl_proxy.md +++ b/docs/kubectl_proxy.md @@ -65,4 +65,4 @@ $ kubectl proxy --api-prefix=k8s-api ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.45092701 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.633829265 +0000 UTC diff --git a/docs/kubectl_resize.md b/docs/kubectl_resize.md index d1762db7e4b..39419535a19 100644 --- a/docs/kubectl_resize.md +++ b/docs/kubectl_resize.md @@ -68,4 +68,4 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.450528897 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.632560634 +0000 UTC diff --git a/docs/kubectl_rolling-update.md b/docs/kubectl_rolling-update.md index 92e7bd4e874..c835992adb4 100644 --- a/docs/kubectl_rolling-update.md +++ b/docs/kubectl_rolling-update.md @@ -68,4 +68,4 @@ $ cat frontend-v2.json | kubectl rolling-update frontend-v1 -f - ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.450394023 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.632023561 +0000 UTC diff --git a/docs/kubectl_run-container.md b/docs/kubectl_run-container.md index c795bbc0e54..9fa460d2d4f 100644 --- a/docs/kubectl_run-container.md +++ b/docs/kubectl_run-container.md @@ -78,4 +78,4 @@ $ kubectl run-container nginx --image=dockerfile/nginx --overrides='{ "apiVersio ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.4510703 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.634391744 +0000 UTC diff --git a/docs/kubectl_stop.md b/docs/kubectl_stop.md index 5943de04363..d79c40bdaab 100644 --- a/docs/kubectl_stop.md +++ b/docs/kubectl_stop.md @@ -72,4 +72,4 @@ $ kubectl stop -f path/to/resources ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.451196696 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.635920945 +0000 UTC diff --git a/docs/kubectl_update.md b/docs/kubectl_update.md index fa40443f1d6..04e93aed7cb 100644 --- a/docs/kubectl_update.md +++ b/docs/kubectl_update.md @@ -67,4 +67,4 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState": ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.449377932 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.630218109 +0000 UTC diff --git a/docs/kubectl_version.md b/docs/kubectl_version.md index f096797c00d..6bd810e61bb 100644 --- a/docs/kubectl_version.md +++ b/docs/kubectl_version.md @@ -51,4 +51,4 @@ kubectl version ### SEE ALSO * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-04-14 14:22:51.452926558 +0000 UTC +###### Auto generated by spf13/cobra at 2015-04-14 19:53:16.641381587 +0000 UTC diff --git a/docs/man/man1/.files_generated b/docs/man/man1/.files_generated index d2127128e1f..0cd2019d1f0 100644 --- a/docs/man/man1/.files_generated +++ b/docs/man/man1/.files_generated @@ -1,14 +1,13 @@ -kubectl.1 kubectl-api-versions.1 kubectl-cluster-info.1 -kubectl-config.1 -kubectl-config-set.1 kubectl-config-set-cluster.1 kubectl-config-set-context.1 kubectl-config-set-credentials.1 +kubectl-config-set.1 kubectl-config-unset.1 kubectl-config-use-context.1 kubectl-config-view.1 +kubectl-config.1 kubectl-create.1 kubectl-delete.1 kubectl-describe.1 @@ -26,3 +25,4 @@ kubectl-run-container.1 kubectl-stop.1 kubectl-update.1 kubectl-version.1 +kubectl.1