From 547ca752e64bfdbb6820f6f107dd3a780bc9b01b Mon Sep 17 00:00:00 2001 From: 00255991 Date: Mon, 29 Nov 2021 14:00:05 +0800 Subject: [PATCH 1/2] [zh] Fix the etcd client certs --- .../tasks/administer-cluster/configure-upgrade-etcd.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md index c64815d38b..fe0d906b21 100644 --- a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md +++ b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md @@ -236,8 +236,8 @@ communication: ``` ETCDCTL_API=3 etcdctl --endpoints 10.2.0.9:2379 \ - --cert=/etc/kubernetes/pki/etcd/server.crt \ - --key=/etc/kubernetes/pki/etcd/server.key \ + --cert=/etc/kubernetes/pki/etcd/client.crt \ + --key=/etc/kubernetes/pki/etcd/client.key \ --cacert=/etc/kubernetes/pki/etcd/ca.crt \ member list ``` @@ -253,8 +253,8 @@ ETCDCTL_API=3 etcdctl --endpoints 10.2.0.9:2379 \ ``` ETCDCTL_API=3 etcdctl --endpoints 10.2.0.9:2379 \ - --cert=/etc/kubernetes/pki/etcd/server.crt \ - --key=/etc/kubernetes/pki/etcd/server.key \ + --cert=/etc/kubernetes/pki/etcd/client.crt \ + --key=/etc/kubernetes/pki/etcd/client.key \ --cacert=/etc/kubernetes/pki/etcd/ca.crt \ member list ``` @@ -665,4 +665,4 @@ ETCDCTL_API=3 etcdctl --endpoints 10.2.0.9:2379 snapshot restore snapshotdb 我们还建议重启所有组件（例如 `kube-scheduler`、`kube-controller-manager`、`kubelet`），以确保它们不会 依赖一些过时的数据。请注意，实际中还原会花费一些时间。 在还原过程中，关键组件将丢失领导锁并自行重启。 -{{< note >}} \ No newline at end of file +{{< note >}} From 4448cdd097f235c8298fa36c707f7792cdd5ddd3 Mon Sep 17 00:00:00 2001 From: h4ghhh <51307338+h4ghhh@users.noreply.github.com> Date: Tue, 30 Nov 2021 09:38:04 +0800 Subject: [PATCH 2/2] Update content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md Co-authored-by: Qiming Teng --- .../zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md index fe0d906b21..ba62aa67f8 100644 --- a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md +++ b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md @@ -665,4 +665,4 @@ ETCDCTL_API=3 etcdctl --endpoints 10.2.0.9:2379 snapshot restore snapshotdb 我们还建议重启所有组件（例如 `kube-scheduler`、`kube-controller-manager`、`kubelet`），以确保它们不会 依赖一些过时的数据。请注意，实际中还原会花费一些时间。 在还原过程中，关键组件将丢失领导锁并自行重启。 -{{< note >}} +{{< /note >}}