Skip to content

Commit 6a54897

Browse files
authored
Merge pull request #47299 from my-git9/pp-9089
[zh-cn] sync configure-upgrade-etcd dns-debugging-resolution
2 parents 5454bac + 84c9754 commit 6a54897

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

content/zh-cn/docs/tasks/administer-cluster/configure-upgrade-etcd.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,15 @@ either be a snapshot file from a previous backup operation, or from a remaining
782782

783783
<!--
784784
If `<data-dir-location>` is the same folder as before, delete it and stop the etcd process before restoring the cluster.
785-
Otherwise, change etcd configuration and restart the etcd process after restoration to have it use the new data directory.
785+
Otherwise, change etcd configuration and restart the etcd process after restoration to have it use the new data directory:
786+
first change `/etc/kubernetes/manifests/etcd.yaml`'s `volumes.hostPath.path` for `name: etcd-data` to `<data-dir-location>`,
787+
then execute `kubectl -n kube-system delete pod <name-of-etcd-pod>` or `systemctl restart kubelet.service` (or both).
786788
-->
787789
如果 `<data-dir-location>` 与之前的文件夹相同,请先删除此文件夹并停止 etcd 进程,再恢复集群。
788-
否则,在恢复后更改 etcd 配置并重启 etcd 进程将使用新的数据目录。
790+
否则,在恢复后更改 etcd 配置并重启 etcd 进程将使用新的数据目录:
791+
首先将 `/etc/kubernetes/manifests/etcd.yaml``name: etcd-data` 对应条目的
792+
`volumes.hostPath.path` 改为 `<data-dir-location>`
793+
然后执行 `kubectl -n kube-system delete pod <name-of-etcd-pod>``systemctl restart kubelet.service`(或两段命令都执行)。
789794

790795
{{% /tab %}}
791796
{{< /tabs >}}

content/zh-cn/docs/tasks/administer-cluster/dns-debugging-resolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kubectl get pods dnsutils
8080
```
8181

8282
```
83-
NAME READY STATUS RESTARTS AGE
83+
NAME READY STATUS RESTARTS AGE
8484
dnsutils 1/1 Running 0 <some-time>
8585
```
8686

0 commit comments

Comments
 (0)