From 9853fed7fd4d2e9ea71340b2ddbc6b55d3dddade Mon Sep 17 00:00:00 2001 From: lichuqiang Date: Tue, 14 Nov 2017 11:22:37 +0800 Subject: [PATCH 1/3] translate doc rollback-daemon-set into Chinese --- .../manage-daemon/rollback-daemon-set.md | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 cn/docs/tasks/manage-daemon/rollback-daemon-set.md diff --git a/cn/docs/tasks/manage-daemon/rollback-daemon-set.md b/cn/docs/tasks/manage-daemon/rollback-daemon-set.md new file mode 100644 index 0000000000..c9684be648 --- /dev/null +++ b/cn/docs/tasks/manage-daemon/rollback-daemon-set.md @@ -0,0 +1,138 @@ +--- +approvers: +- janetkuo +title: 对 DaemonSet 执行回滚 +--- + +{% capture overview %} + +本文展示了如何对 DaemonSet 执行回滚。 + +{% endcapture %} + + +{% capture prerequisites %} + +* DaemonSet 滚动升级历史和 DaemonSet 回滚特性仅在 Kubernetes 1.7 及以后版本的 `kubectl` 中支持。 +* 确保您了解如何 [对 DaemonSet 执行滚动升级](/docs/tasks/manage-daemon/update-daemon-set/)。 + +{% endcapture %} + + +{% capture steps %} + +## 对 DaemonSet 执行回滚 + +### 步骤 1： 找到想要 DaemonSet 回滚到的历史版本（revision） + +如果只想回滚到最后一个版本，可以跳过这一步。 + +列出 DaemonSet 的所有版本： + +```shell +kubectl rollout history daemonset +``` + +该命令返回 DaemonSet 版本列表： + +```shell +daemonsets "" +REVISION CHANGE-CAUSE +1 ... +2 ... +... +``` + +* 在创建时，DaemonSet 的变化原因从 `kubernetes.io/change-cause` 注解（annotation）复制到其版本中。 用户可以在 `kubectl` 中指定 `--record=true` ，将执行的命令记录在变化原因注解中。 + +执行以下命令，来查看指定版本的详细信息： + +```shell +kubectl rollout history daemonset --revision=1 +``` + +该命令返回相应版本的详细信息： + +```shell +daemonsets "" with revision #1 +Pod Template: +Labels: foo=bar +Containers: +app: + Image: ... + Port: ... + Environment: ... + Mounts: ... +Volumes: ... +``` + +### 步骤 2： 回滚到指定版本 + +```shell +# 在 --to-revision 中指定您从步骤 1 中获取的版本序号 +kubectl rollout undo daemonset --to-revision= +``` + +如果成功，命令会返回： + +```shell +daemonset "" rolled back +``` + +如果 `--to-revision` 参数未指定，将选中最近的版本。 + +### 步骤 3： 观察 DaemonSet 回滚进度 + +`kubectl rollout undo daemonset` 向服务器表明启动 DaemonSet 回滚。 真正的回滚是在服务器端异步完成的。 + +执行以下命令，来观察 DaemonSet 回滚进度： + +```shell +kubectl rollout status ds/ +``` + +回滚完成时，输出形如： + +```shell +daemonset "" successfully rolled out +``` + +{% endcapture %} + + +{% capture discussion %} + +## 理解 DaemonSet 版本 + +在前面的 `kubectl rollout history` 步骤中，您获得了一个版本列表，每个版本都存储在名为 + `ControllerRevision` 的资源中。 `ControllerRevision` 仅在 Kubernetes 1.7 及以后的版本中可用。 + +查找原始的版本资源，来查看每个版本中存储了什么内容： + +```shell +kubectl get controllerrevision -l = +``` + +该命令返回 `ControllerRevisions` 列表： + +```shell +NAME CONTROLLER REVISION AGE +- DaemonSet/ 1 1h +- DaemonSet/ 2 1h +``` + +每个 `ControllerRevision` 中存储了相应 DaemonSet 版本的注解和模板。 + +`kubectl rollout undo` 采用特定 `ControllerRevision` ，并用 +`ControllerRevision` 中存储的模板代替 DaemonSet 的模板。 +`kubectl rollout undo` 相当于通过其他命令（如 `kubectl edit` 或 `kubectl apply`）将 DaemonSet 模板更新至先前的版本。 + +注意 DaemonSet 版本只会向前滚动。 也就是说，回滚完成后，所回滚到的 `ControllerRevision` 版本号 (`.revision` 字段) 会增加。 例如，如果用户在系统中有版本 1 和版本 2，并从版本 2 回滚到版本 1 ，带有 `.revision: 1` 的`ControllerRevision` 将变为 `.revision: 3`。 + +## 故障排除 + +* 查看 [DaemonSet 滚动升级故障排除](/docs/tasks/manage-daemon/update-daemon-set/#troubleshooting)。 + +{% endcapture %} + +{% include templates/task.md %} From 134507dbc11593666b69a0d4f3dea653f9598058 Mon Sep 17 00:00:00 2001 From: XsWack Date: Wed, 15 Nov 2017 17:16:14 +0800 Subject: [PATCH 2/3] move kubefed to /docs/reference/generated directory (#6325) * move kubefed to docs/reference/generated * update _redirects and _data/referenerce.yaml --- _data/reference.yml | 12 ++++++------ _redirects | 7 +++++++ docs/{admin => reference/generated}/kubefed.md | 0 docs/{admin => reference/generated}/kubefed_init.md | 0 docs/{admin => reference/generated}/kubefed_join.md | 0 .../generated}/kubefed_options.md | 0 .../{admin => reference/generated}/kubefed_unjoin.md | 0 .../generated}/kubefed_version.md | 0 8 files changed, 13 insertions(+), 6 deletions(-) rename docs/{admin => reference/generated}/kubefed.md (100%) rename docs/{admin => reference/generated}/kubefed_init.md (100%) rename docs/{admin => reference/generated}/kubefed_join.md (100%) rename docs/{admin => reference/generated}/kubefed_options.md (100%) rename docs/{admin => reference/generated}/kubefed_unjoin.md (100%) rename docs/{admin => reference/generated}/kubefed_version.md (100%) diff --git a/_data/reference.yml b/_data/reference.yml index 0884201608..7df5e8a79f 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -73,12 +73,12 @@ toc: - docs/admin/kubeadm.md - title: Kubefed section: - - docs/admin/kubefed.md - - docs/admin/kubefed_options.md - - docs/admin/kubefed_init.md - - docs/admin/kubefed_join.md - - docs/admin/kubefed_unjoin.md - - docs/admin/kubefed_version.md + - docs/reference/generated/kubefed.md + - docs/reference/generated/kubefed_options.md + - docs/reference/generated/kubefed_init.md + - docs/reference/generated/kubefed_join.md + - docs/reference/generated/kubefed_unjoin.md + - docs/reference/generated/kubefed_version.md - title: Config Reference section: diff --git a/_redirects b/_redirects index b7e3bc1af9..d0647d85ac 100644 --- a/_redirects +++ b/_redirects @@ -410,3 +410,10 @@ /v1.1/docs/getting-started-guides/ /docs/tutorials/kubernetes-basics/ 301 https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"splat 301 + +/docs/admin/kubefed/ /docs/reference/generated/kubefed/ 301 +/docs/admin/kubefed_init/ /docs/reference/generated/kubefed_init/ 301 +/docs/admin/kubefed_join/ /docs/reference/generated/kubefed_join/ 301 +/docs/admin/kubefed_options/ /docs/reference/generated/kubefed_options/ 301 +/docs/admin/kubefed_unjoin/ /docs/reference/generated/kubefed_unjoin/ 301 +/docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301 \ No newline at end of file diff --git a/docs/admin/kubefed.md b/docs/reference/generated/kubefed.md similarity index 100% rename from docs/admin/kubefed.md rename to docs/reference/generated/kubefed.md diff --git a/docs/admin/kubefed_init.md b/docs/reference/generated/kubefed_init.md similarity index 100% rename from docs/admin/kubefed_init.md rename to docs/reference/generated/kubefed_init.md diff --git a/docs/admin/kubefed_join.md b/docs/reference/generated/kubefed_join.md similarity index 100% rename from docs/admin/kubefed_join.md rename to docs/reference/generated/kubefed_join.md diff --git a/docs/admin/kubefed_options.md b/docs/reference/generated/kubefed_options.md similarity index 100% rename from docs/admin/kubefed_options.md rename to docs/reference/generated/kubefed_options.md diff --git a/docs/admin/kubefed_unjoin.md b/docs/reference/generated/kubefed_unjoin.md similarity index 100% rename from docs/admin/kubefed_unjoin.md rename to docs/reference/generated/kubefed_unjoin.md diff --git a/docs/admin/kubefed_version.md b/docs/reference/generated/kubefed_version.md similarity index 100% rename from docs/admin/kubefed_version.md rename to docs/reference/generated/kubefed_version.md From 16f6a6159644245f0c731df470d2fce72742c86a Mon Sep 17 00:00:00 2001 From: XsWack Date: Wed, 15 Nov 2017 17:45:12 +0800 Subject: [PATCH 3/3] move federation-apiserver federation-controller-manager to /docs/reference/generated directory (#6327) * move federation-apiserver federation-controller-manager to /docs/reference/generated directory * update _redirects and _data/referenerce.yaml --- _data/reference.yml | 4 ++-- _redirects | 7 ++++++- .../{admin => reference/generated}/federation-apiserver.md | 0 .../generated}/federation-controller-manager.md | 0 4 files changed, 8 insertions(+), 3 deletions(-) rename docs/{admin => reference/generated}/federation-apiserver.md (100%) rename docs/{admin => reference/generated}/federation-controller-manager.md (100%) diff --git a/_data/reference.yml b/_data/reference.yml index 7df5e8a79f..bd2e8cc368 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -89,8 +89,8 @@ toc: - docs/admin/kube-proxy.md - docs/admin/kube-scheduler.md - docs/admin/kubelet-tls-bootstrapping.md - - docs/admin/federation-apiserver.md - - docs/admin/federation-controller-manager.md + - docs/reference/generated/federation-apiserver.md + - docs/reference/generated/federation-controller-manager.md - title: Kubernetes Design Docs section: diff --git a/_redirects b/_redirects index d0647d85ac..12512f33d0 100644 --- a/_redirects +++ b/_redirects @@ -411,9 +411,14 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"splat 301 + +/docs/admin/federation-controller-manager/ /docs/reference/generated/federation-controller-manager/ 301 +/docs/admin/federation-apiserver/ /docs/reference/generated/federation-apiserver/ 301 + /docs/admin/kubefed/ /docs/reference/generated/kubefed/ 301 /docs/admin/kubefed_init/ /docs/reference/generated/kubefed_init/ 301 /docs/admin/kubefed_join/ /docs/reference/generated/kubefed_join/ 301 /docs/admin/kubefed_options/ /docs/reference/generated/kubefed_options/ 301 /docs/admin/kubefed_unjoin/ /docs/reference/generated/kubefed_unjoin/ 301 -/docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301 \ No newline at end of file +/docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301 + diff --git a/docs/admin/federation-apiserver.md b/docs/reference/generated/federation-apiserver.md similarity index 100% rename from docs/admin/federation-apiserver.md rename to docs/reference/generated/federation-apiserver.md diff --git a/docs/admin/federation-controller-manager.md b/docs/reference/generated/federation-controller-manager.md similarity index 100% rename from docs/admin/federation-controller-manager.md rename to docs/reference/generated/federation-controller-manager.md