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_trans: kubeadm-config.md #11684

Closed
wants to merge 2 commits into from
Closed

zh_trans: kubeadm-config.md #11684

wants to merge 2 commits into from

Conversation

congfairy
Copy link
Contributor

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Please delete this note before submitting the pull request.

For 1.14 Features: set Milestone to 1.14 and Base Branch to dev-1.14

For Chinese localization, base branch to release-1.12

Help editing and submitting pull requests:
https://kubernetes.io/docs/contribute/start/#improve-existing-content.

Help choosing which branch to use:
https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 11, 2018
@netlify
Copy link

netlify bot commented Dec 11, 2018 •
edited
Loading

Deploy preview for k8s-v1-12 processing.

Built with commit 9923c3e

https://app.netlify.com/sites/k8s-v1-12/deploys/5c1091077da1d400085d5ca8

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 11, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: tfogo

If they are not already assigned, you can assign the PR to them by writing /assign @tfogo in a comment when ready.

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

@xichengliudui
Copy link
Contributor

@congfairy
混合内容在以下情况下出现：初始 HTML 内容通过安全的 HTTPS 连接加载，但其他资源（例如，图像、视频、样式表、脚本）则通过不安全的 HTTP 连接加载。之所以称为混合内容，是因为同时加载了 HTTP 和 HTTPS 内容以显示同一个页面，且通过 HTTPS 加载的初始请求是安全的。现代浏览器会针对此类型的内容显示警告，以向用户表明此页面包含不安全的资源。

xichengliudui
xichengliudui reviewed Dec 11, 2018
View reviewed changes
content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
- mikedanese
- luxas
- jbeda
title: kubeadm config
Copy link
Contributor

Choose a reason for hiding this comment

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

title: kubeadm config
title: kubeadm 配置

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
-->

{{％capture overview％}}
从v1.8.0开始，kubeadm 将集群的配置上传到名为 `kube-system`的 ConfigMap 中，其在`kubeadm-config` 命名空间，稍后在升级时读取ConfigMap。
Copy link
Contributor

Choose a reason for hiding this comment

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

从v1.8.0开始，kubeadm 将集群的配置上传到名为 kube-system的 ConfigMap 中，其在kubeadm-config 命名空间，稍后在升级时读取ConfigMap。
从 v1.8.0 开始，kubeadm 将集群的配置上传到名为 kube-system 的 ConfigMap 对象中，对象位于 kube-system 命名空间内。并在以后的升级中读取这个 ConfigMap 配置对象。

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated

{{％capture overview％}}
从v1.8.0开始，kubeadm 将集群的配置上传到名为 `kube-system`的 ConfigMap 中，其在`kubeadm-config` 命名空间，稍后在升级时读取ConfigMap。
这样可以正确配置系统组件，并提供无缝的用户体验。
Copy link
Contributor

Choose a reason for hiding this comment

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

这样可以正确配置系统组件，并提供无缝的用户体验。
这样可以保证系统组件的正确配置，提供无缝的用户体验。

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
may use `kubeadm upgrade`.
-->

您可以执行`kubeadm config view`来查看ConfigMap。如果使用kubeadm v1.7.x或更低版本来初始化群集
Copy link
Contributor

Choose a reason for hiding this comment

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

您可以执行kubeadm config view来查看ConfigMap。如果使用kubeadm v1.7.x或更低版本来初始化群集
您可以执行 kubeadm config view 来查看 ConfigMap。如果使用 kubeadm v1.7.x 或更低版本来初始化群集

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
-->

您可以执行`kubeadm config view`来查看ConfigMap。如果使用kubeadm v1.7.x或更低版本来初始化群集
，您必须在使用`kubeadm upgrade`前先使用`kubeadm config upload`创建ConfigMap。
Copy link
Contributor

Choose a reason for hiding this comment

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

，您必须在使用kubeadm upgrade前先使用kubeadm config upload创建ConfigMap。
，必须先使用 kubeadm config upload 创建 ConfigMap，然后才能使用 kubeadm upgrade。

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
to list and pull the images that kubeadm requires.
-->

在Kubernetes v1.11.0中，添加了一些新命令。你可以使用`kubeadm config print-default`
Copy link
Contributor

Choose a reason for hiding this comment

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

在Kubernetes v1.11.0中，添加了一些新命令。你可以使用kubeadm config print-default
在 Kubernetes v1.11.0 中，添加了一些新命令。你可以使用 kubeadm config print-default

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md Outdated
-->

在Kubernetes v1.11.0中，添加了一些新命令。你可以使用`kubeadm config print-default`
打印默认配置,也可以用 `kubeadm config migrate` 来将就配置文件转换到较新的版本。可以使用`kubeadm config images list`和`kubeadm config images pull`
Copy link
Contributor

Choose a reason for hiding this comment

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

可以使用kubeadm config images list和kubeadm config images pull
可以使用 kubeadm config images list 和 kubeadm config images pull

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
{{% /capture %}}

{{% capture body %}}
## kubeadm config upload from-file {#cmd-config-from-file}
Copy link
Contributor

Choose a reason for hiding this comment

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

这里以及下面这些子标题也需要翻译。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

capture这里怎么翻译呢 @xichengliudui

Copy link
Contributor

Choose a reason for hiding this comment

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

@congfairy
不，我指的不是：capture body
而是：kubeadm config upload from-file

content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md

{{% /capture %}}

{{% capture whatsnext %}}
Copy link
Contributor

Choose a reason for hiding this comment

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

这一句忘了翻译了吗？

@xichengliudui
Copy link
Contributor

@congfairy , 感谢贡献，希望下一次可以注意中英文之间的格式。

@xichengliudui xichengliudui mentioned this pull request Dec 11, 2018
Closed
@Mr-Linus
Copy link
Contributor

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 12, 2018
@congfairy congfairy closed this Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xichengliudui xichengliudui xichengliudui left review comments

@jimangel jimangel Awaiting requested review from jimangel

@Rajakavitha1 Rajakavitha1 Awaiting requested review from Rajakavitha1

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@congfairy @k8s-ci-robot @xichengliudui @Mr-Linus