Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[zh] Resync kubeadm files (3) #27723

Merged
merged 1 commit into from
May 10, 2021
Merged

[zh] Resync kubeadm files (3) #27723

merged 1 commit into from
May 10, 2021

Conversation

tengqm
Copy link
Contributor

@tengqm tengqm commented Apr 26, 2021

Related: #27670

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 26, 2021
@tengqm tengqm mentioned this pull request Apr 26, 2021
Closed
@netlify
Copy link

netlify bot commented Apr 26, 2021 •
edited
Loading

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 9ba6ac6

https://deploy-preview-27723--kubernetes-io-master-staging.netlify.app

howieyuen
howieyuen suggested changes Apr 30, 2021
View reviewed changes
content/zh/docs/reference/setup-tools/kubeadm/_index.md Outdated
* [kubeadm reset](/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset)
用于恢复通过 `kubeadm init` 或者 `kubeadm join` 命令对节点进行的任何变更
* [kubeadm certs](/docs/reference/setup-tools/kubeadm/kubeadm-certs)
用来管理 Kubernetes 证书
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

用于管理

content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
你也可以在使用 `kubeadm init` 命令时配置若干 kubelet 配置选项。
这些选项对于集群中所有节点而言都是相同的。
参阅[使用 kubeadm 来配置集群中的各个 kubelet](/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration/)
了解细节信息。
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

了解详细信息

content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md Outdated
## 启用已签名的 kubelet 服务证书 {#kubelet-serving-certs}

默认情况下，kubeadm 所部署的 kubelet 服务证书是自签名（Self-Signed）。）
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

句末右括号

content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md Outdated
and restart the kubelet with `systemctl restart kubelet`
-->
如果你已经创建の集群，你必须通过执行下面的操作来完成适配：
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Japanese??? 😲

content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md Outdated
的 ConfigMap 并编辑之。
在该 ConfigMap 中，`config` 键下面有一个
[KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zh link

@tengqm tengqm force-pushed the zh-sync-kubeadm-3 branch from 57936dc to b1bf2bc Compare April 30, 2021 12:04
@howieyuen
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 6, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 677a51fcf7bb9109cc06cd6b4e1d95e62506c34d

@tanjunchen
Copy link
Member

@tengqm plz deal with the conflicts.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 9, 2021
@tengqm tengqm force-pushed the zh-sync-kubeadm-3 branch from b1bf2bc to 9ba6ac6 Compare May 10, 2021 00:36
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 10, 2021
@tengqm
Copy link
Contributor Author

tengqm commented May 10, 2021

@tanjunchen rebased.

@howieyuen
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: a1eae046cc757b01828d0abc61454803781cb8e9

tanjunchen
tanjunchen reviewed May 10, 2021
View reviewed changes
Copy link
Member

@tanjunchen tanjunchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tanjunchen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1075bd4 into kubernetes:master May 10, 2021
@tengqm tengqm deleted the zh-sync-kubeadm-3 branch May 10, 2021 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tanjunchen tanjunchen tanjunchen left review comments

@howieyuen howieyuen howieyuen requested changes

@chenrui333 chenrui333 Awaiting requested review from chenrui333

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@howieyuen howieyuen

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tengqm @howieyuen @k8s-ci-robot @tanjunchen