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.

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

Create website/content/zh/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html and deploy-interactive.html #14790

Merged
merged 9 commits into from Jun 12, 2019

Conversation

@ChongmingDu
Copy link

commented Jun 8, 2019

website/content/zh/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html and deploy-interactive.html translated into Chinese.

ChongmingDu added some commits May 20, 2019


<div class="row">
<div class="row">

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member

可以用editor align 一下。


<div class="col-md-8">
<!-- <h3>Kubernetes Clusters</h3> -->
<h3>Kubernetes集群</h3>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<h3>Kubernetes集群</h3>
<h3>Kubernetes 集群</h3>
<p>Kubernetes 集群包含两种资源类型:
<ul>
<!-- <li>The <b>Master</b> coordinates the cluster</li> -->
<li> <b> Master </b> 协调集群</li>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<li> <b> Master </b> 协调集群</li>
<li> <b>主节点</b> 协调集群</li>
<!-- <li>The <b>Master</b> coordinates the cluster</li> -->
<li> <b> Master </b> 协调集群</li>
<!-- <li><b>Nodes</b> are the workers that run applications</li> -->
<li><b> Node </b> 运行应用的工作节点</li>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member

这个原文不是特别准确

master node
worker node

都算是node。

Suggested change
<li><b> Node </b> 运行应用的工作节点</li>
<li><b>工作节点</b> 运行应用的工作节点</li>
<div class="row">
<div class="col-md-8">
<!-- <p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activities in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p> -->
<p><b> Master 节点负责管理集群</b> master 负责协调集群中的所有活动,例如调度应用程序,维护应用程序的所需状态,扩展应用程序以及回滚更新。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p><b> Master 节点负责管理集群</b> master 负责协调集群中的所有活动,例如调度应用程序,维护应用程序的所需状态,扩展应用程序以及回滚更新。</p>
<p><b>主节点负责管理集群</b> 主节点负责协调集群中的所有活动,例如调度应用程序,维护应用程序的所需状态,扩展应用程序以及回滚更新。</p>
<!-- <p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activities in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p> -->
<p><b> Master 节点负责管理集群</b> master 负责协调集群中的所有活动,例如调度应用程序,维护应用程序的所需状态,扩展应用程序以及回滚更新。</p>
<!-- <p><b>A node is a VM or a physical computer that serves as a worker machine in a Kubernetes cluster.</b> Each node has a Kubelet, which is an agent for managing the node and communicating with the Kubernetes master. The node should also have tools for handling container operations, such as Docker or rkt. A Kubernetes cluster that handles production traffic should have a minimum of three nodes.</p> -->
<p><b> Node 节点是虚拟机或物理机,充当 Kubernetes 集群中的计算节点。</b>每个节点都有一个 Kubelet ,它是一个管理节点并与 Kubernetes master 节点通信的代理。该节点还应具有用于处理容器操作的工具,例如 Docker 或 rkt 。应用于生产的 Kubernetes 集群应至少有三个节点。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p><b> Node 节点是虚拟机或物理机,充当 Kubernetes 集群中的计算节点。</b>每个节点都有一个 Kubelet ,它是一个管理节点并与 Kubernetes master 节点通信的代理。该节点还应具有用于处理容器操作的工具,例如 Docker 或 rkt 。应用于生产的 Kubernetes 集群应至少有三个节点。</p>
<p><b>工作节点是虚拟机或物理机,充当 Kubernetes 集群中的计算节点。</b>每个节点都有一个 Kubelet ,它是一个管理节点并与 Kubernetes master 节点通信的代理。该节点还应具有用于处理容器操作的工具,例如 Docker 或 rkt 。应用于生产的 Kubernetes 集群应至少有三个节点。</p>
<div class="col-md-4">
<div class="content__box content__box_fill">
<!-- <p><i>Masters manage the cluster and the nodes are used to host the running applications.</i></p> -->
<p><i> Master 节点管理集群,Node 节点用于承载运行的应用程序。</i></p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p><i> Master 节点管理集群,Node 节点用于承载运行的应用程序。</i></p>
<p><i>主节点管理集群,工作节点用于承载运行的应用程序。</i></p>
<div class="row">
<div class="col-md-8">
<!-- <p>When you deploy applications on Kubernetes, you tell the master to start the application containers. The master schedules the containers to run on the cluster's nodes. <b>The nodes communicate with the master using the Kubernetes API</b>, which the master exposes. End users can also use the Kubernetes API directly to interact with the cluster.</p> -->
<p>在 Kubernetes 上部署应用程序时,您可以与 master 节点交互启动应用容器。 master 节点调度容器以在集群的 Node 节点上运行。 <b> node 节点使用 master 节点公开的 Kubernetes API </b>与 master 节点进行通信。最终用户还可以直接使用 Kubernetes API 与群集进行交互。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member

你可以 batch replace 一下
master 节点 -> 主节点
node 节点 -> 工作节点

Suggested change
<p>在 Kubernetes 上部署应用程序时,您可以与 master 节点交互启动应用容器。 master 节点调度容器以在集群的 Node 节点上运行。 <b> node 节点使用 master 节点公开的 Kubernetes API </b>与 master 节点进行通信。最终用户还可以直接使用 Kubernetes API 与群集进行交互。</p>
<p>在 Kubernetes 上部署应用程序时,您可以与 master 节点交互启动应用容器。 master 节点调度容器以在集群的 Node 节点上运行。 <b> node 节点使用 master 节点公开的 Kubernetes API </b>与 master 节点进行通信。最终用户还可以直接使用 Kubernetes API 与群集进行交互。</p>
<p>在 Kubernetes 上部署应用程序时,您可以与 master 节点交互启动应用容器。 master 节点调度容器以在集群的 Node 节点上运行。 <b> node 节点使用 master 节点公开的 Kubernetes API </b>与 master 节点进行通信。最终用户还可以直接使用 Kubernetes API 与群集进行交互。</p>

<!-- <p>A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use Minikube. Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, macOS, and Windows systems. The Minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this tutorial, however, you'll use a provided online terminal with Minikube pre-installed.</p> -->
<p> Kubernetes 集群可以部署在物理机或虚拟机上。要使用 Kubernetes ,您可以使用 Minikube 。 Minikube 是一种轻量级的 Kubernetes ,可以在本地机器上创建虚拟机并部署只有一个节点的简单集群。 Minikube 使用与 Linux , macOS 和 Windows 系统。Minikube CLI 提供了与集群一起使用的基本引导操作,包括启动,停止,状态和删除。但是对于本教程,您将使用预先安装了 Minikube 的在线终端。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p> Kubernetes 集群可以部署在物理机或虚拟机上。要使用 Kubernetes ,您可以使用 Minikube 。 Minikube 是一种轻量级的 Kubernetes ,可以在本地机器上创建虚拟机并部署只有一个节点的简单集群。 Minikube 使用与 Linux , macOS 和 Windows 系统。Minikube CLI 提供了与集群一起使用的基本引导操作,包括启动,停止,状态和删除。但是对于本教程,您将使用预先安装了 Minikube 的在线终端。</p>
<p> Kubernetes 集群可以部署在物理机或虚拟机上。要使用 Kubernetes ,您可以使用 Minikube 。 Minikube 是一种轻量级的 Kubernetes ,可以在本地机器上创建虚拟机并部署只有一个节点的简单集群。 Minikube 使用与 Linux, macOS 和 Windows 系统。Minikube CLI 提供了与集群一起使用的基本引导操作,包括启动,停止,状态和删除。但是对于本教程,您将使用预先安装了 Minikube 的在线终端。</p>
<p>创建应用程序实例后,Kubernetes Deployment 控制器会持续监视这些实例。 如果托管实例的节点关闭或被删除,则 Deployment 控制器会将该实例替换为群集中另一个节点上的实例。 <b>这提供了一种自我修复机制来解决机器故障维护问题。</b></p>

<!-- <p>In a pre-orchestration world, installation scripts would often be used to start applications, but they did not allow recovery from machine failure. By both creating your application instances and keeping them running across Nodes, Kubernetes Deployments provide a fundamentally different approach to application management. </p> -->
<p>在没有 Kubernetes 这种编排系统之前,安装脚本通常用于启动应用程序,但它们不允许从机器故障中恢复。通过创建应用程序实例并使它们在节点之间运行, Kubernetes Deployments 提供了一种与众不同的应用程序管理方法。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p>在没有 Kubernetes 这种编排系统之前,安装脚本通常用于启动应用程序,但它们不允许从机器故障中恢复。通过创建应用程序实例并使它们在节点之间运行, Kubernetes Deployments 提供了一种与众不同的应用程序管理方法。</p>
<p>在没有 Kubernetes 这种编排系统之前,安装脚本通常用于启动应用程序,但它们不允许从机器故障中恢复。通过创建应用程序实例并使它们在节点之间运行,Kubernetes Deployments 提供了一种与众不同的应用程序管理方法。</p>
<div class="col-md-8">

<!-- <p>You can create and manage a Deployment by using the Kubernetes command line interface, <b>Kubectl</b>. Kubectl uses the Kubernetes API to interact with the cluster. In this module, you'll learn the most common Kubectl commands needed to create Deployments that run your applications on a Kubernetes cluster.</p> -->
<p>您可以使用 Kubernetes 命令行界面创建和管理 Deployment,<b>Kubectl</b>. Kubectl 使用 Kubernetes API 与集群进行交互。在本单元中,您将学习创建在 Kubernetes 集群上运行应用程序的 Deployment 所需的最常见的 Kubectl 命令。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member
Suggested change
<p>您可以使用 Kubernetes 命令行界面创建和管理 Deployment,<b>Kubectl</b>. Kubectl 使用 Kubernetes API 与集群进行交互。在本单元中,您将学习创建在 Kubernetes 集群上运行应用程序的 Deployment 所需的最常见的 Kubectl 命令。</p>
<p>您可以使用 Kubernetes 命令行界面创建和管理 Deployment,<b>Kubectl</b>. Kubectl 使用 Kubernetes API 与集群进行交互。在本单元中,您将学习创建在 Kubernetes 集群上运行应用程序的 Deployment 所需的最常见的 Kubectl 命令。</p>

<!-- <p>When you create a Deployment, you'll need to specify the container image for your application and the number of replicas that you want to run. You can change that information later by updating your Deployment; Modules <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> and <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> of the bootcamp discuss how you can scale and update your Deployments.</p> -->
<p>创建 Deployment 时,您需要指定应用程序的容器映像以及要运行的副本数。您可以稍后通过更新 Deployment 来更改该信息; 模块 <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> 和 <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> 讨论了如何扩展和更新 Deployments。</p>

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 9, 2019

Member

line 102 - 104 可以删掉。

@chenrui333
Copy link
Member

left a comment

就是注意一下
master node -> 主节点
worker node -> 工作节点

就好了。

title: Interactive Tutorial - Deploying an App
weight: 20
--- -->
---

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 11, 2019

Member

这个需要放到 上面 comment-out code block的前面。

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 11, 2019

Member

主要是跟 hugo proprocessing 有点关系。

title: Using kubectl to Create a Deployment
weight: 10
--- -->
---

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 11, 2019

Member

这个也是需要放到 第一行。

@@ -1,7 +1,3 @@
---

This comment has been minimized.

Copy link
@chenrui333

chenrui333 Jun 11, 2019

Member

这个 可能还是需要保留的 主要是 供 hugo 用的。

@chenrui333
Copy link
Member

left a comment

/lgtm
/approve

@chenrui333

This comment has been minimized.

Copy link
Member

commented Jun 11, 2019

Have conflict with the merge.

Conflicting files
content/zh/docs/tutorials/kubernetes-basics/cluster-intro.html

ChongmingDu added some commits Jun 12, 2019

fix
@markthink

This comment has been minimized.

Copy link
Member

commented Jun 12, 2019

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Copy link

commented Jun 12, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chenrui333, markthink

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

@markthink markthink merged commit f444152 into kubernetes:release-1.14 Jun 12, 2019

4 of 8 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
deploy/netlify Deploy preview processing.
Details
tide Not mergeable. Jobs continuous-integration/travis-ci/pr, deploy/netlify have not succeeded.
Details
Pages changed 582 new files uploaded
Details
Header rules 1 header rule processed
Details
Mixed content No mixed content detected
Details
Redirect rules 1 redirect rule processed
Details
cla/linuxfoundation ChongmingDu authorized
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.