Skip to content

Commit 6fea231

Browse files
authored
Merge pull request #28171 from chenrui333/zh/sync-what-is-k8s
zh: resync concept files
2 parents 1563603 + d3217b3 commit 6fea231

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

content/zh/docs/concepts/overview/what-is-kubernetes.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ Kubernetes 是一个可移植的、可扩展的开源平台,用于管理容器
3535
Kubernetes 拥有一个庞大且快速增长的生态系统。Kubernetes 的服务、支持和工具广泛可用。
3636

3737
<!--
38-
The name Kubernetes originates from Greek, meaning helmsman or pilot. Google open-sourced the Kubernetes project in 2014. Kubernetes builds upon a [decade and a half of experience that Google has with running production workloads at scale](https://research.google/pubs/pub43438), combined with best-of-breed ideas and practices from the community.
38+
The name Kubernetes originates from Greek, meaning helmsman or pilot. K8s as an abbreviation results from counting the eight letters between the "K" and the "s". Google open-sourced the Kubernetes project in 2014. Kubernetes combines [over 15 years of Google's experience](/blog/2015/04/borg-predecessor-to-kubernetes/) running production workloads at scale with best-of-breed ideas and practices from the community.
3939
-->
40-
名称 **Kubernetes** 源于希腊语,意为“舵手”或“飞行员”。Google 在 2014 年开源了 Kubernetes 项目。
41-
Kubernetes 建立在 [Google 在大规模运行生产工作负载方面拥有十几年的经验](https://research.google/pubs/pub43438)
40+
**Kubernetes** 这个名字源于希腊语,意为“舵手”或“飞行员”。k8s 这个缩写是因为 k 和 s 之间有八个字符的关系。
41+
Google 在 2014 年开源了 Kubernetes 项目。Kubernetes 建立在
42+
[Google 在大规模运行生产工作负载方面拥有十几年的经验](https://research.google/pubs/pub43438)
4243
的基础上,结合了社区中最好的想法和实践。
4344

4445
<!--
@@ -155,7 +156,7 @@ Kubernetes provides you with:
155156
Kubernetes 为你提供:
156157

157158
<!--
158-
* **Service discovery and load balancing**
159+
* **Service discovery and load balancing**
159160
Kubernetes can expose a container using the DNS name or using their own IP address. If traffic to a container is high, Kubernetes is able to load balance and distribute the network traffic so that the deployment is stable.
160161
-->
161162
* **服务发现和负载均衡**
@@ -164,15 +165,15 @@ Kubernetes can expose a container using the DNS name or using their own IP addre
164165
Kubernetes 可以负载均衡并分配网络流量,从而使部署稳定。
165166

166167
<!--
167-
* **Storage orchestration**
168+
* **Storage orchestration**
168169
Kubernetes allows you to automatically mount a storage system of your choice, such as local storages, public cloud providers, and more.
169170
-->
170171
* **存储编排**
171172

172173
Kubernetes 允许你自动挂载你选择的存储系统,例如本地存储、公共云提供商等。
173174

174175
<!--
175-
* **Automated rollouts and rollbacks**
176+
* **Automated rollouts and rollbacks**
176177
You can describe the desired state for your deployed containers using Kubernetes, and it can change the actual state to the desired state at a controlled rate. For example, you can automate Kubernetes to create new containers for your deployment, remove existing containers and adopt all their resources to the new container.
177178
-->
178179
* **自动部署和回滚**
@@ -182,7 +183,7 @@ You can describe the desired state for your deployed containers using Kubernetes
182183
删除现有容器并将它们的所有资源用于新容器。
183184

184185
<!--
185-
* **Automatic bin packing**
186+
* **Automatic bin packing**
186187
Kubernetes allows you to specify how much CPU and memory (RAM) each container needs. When containers have resource requests specified, Kubernetes can make better decisions to manage the resources for containers.
187188
-->
188189
* **自动完成装箱计算**
@@ -191,7 +192,7 @@ Kubernetes allows you to specify how much CPU and memory (RAM) each container ne
191192
当容器指定了资源请求时,Kubernetes 可以做出更好的决策来管理容器的资源。
192193

193194
<!--
194-
* **Self-healing**
195+
* **Self-healing**
195196
Kubernetes restarts containers that fail, replaces containers, kills containers that don’t respond to your user-defined health check, and doesn’t advertise them to clients until they are ready to serve.
196197
-->
197198
* **自我修复**
@@ -200,7 +201,7 @@ Kubernetes restarts containers that fail, replaces containers, kills containers
200201
运行状况检查的容器,并且在准备好服务之前不将其通告给客户端。
201202

202203
<!--
203-
* **Secret and configuration management**
204+
* **Secret and configuration management**
204205
Kubernetes lets you store and manage sensitive information, such as passwords, OAuth tokens, and ssh keys. You can deploy and update secrets and application configuration without rebuilding your container images, and without exposing secrets in your stack configuration.
205206
-->
206207
* **密钥与配置管理**

content/zh/docs/concepts/overview/working-with-objects/common-labels.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ on every resource object.
6868
| `app.kubernetes.io/version` | The current version of the application (e.g., a semantic version, revision hash, etc.) | `5.7.21` | string |
6969
| `app.kubernetes.io/component` | The component within the architecture | `database` | string |
7070
| `app.kubernetes.io/part-of` | The name of a higher level application this one is part of | `wordpress` | string |
71-
| `app.kubernetes.io/managed-by` | The tool being used to manage the operation of an application | `helm` | string |
71+
| `app.kubernetes.io/managed-by` | The tool being used to manage the operation of an application | `helm` | string |
72+
| `app.kubernetes.io/created-by` | The controller/user who created this resource | `controller-manager` | string |
7273
-->
7374
|| 描述 | 示例 | 类型 |
7475
| ----------------------------------- | --------------------- | -------- | ---- |
@@ -77,7 +78,8 @@ on every resource object.
7778
| `app.kubernetes.io/version` | 应用程序的当前版本(例如,语义版本,修订版哈希等) | `5.7.21` | 字符串 |
7879
| `app.kubernetes.io/component` | 架构中的组件 | `database` | 字符串 |
7980
| `app.kubernetes.io/part-of` | 此级别的更高级别应用程序的名称 | `wordpress` | 字符串 |
80-
| `app.kubernetes.io/managed-by` | 用于管理应用程序的工具 | `helm` | 字符串 |
81+
| `app.kubernetes.io/managed-by` | 用于管理应用程序的工具 | `helm` | 字符串 |
82+
| `app.kubernetes.io/created-by` | 创建该资源的控制器或者用户 | `controller-manager` | 字符串 |
8183
<!--
8284
To illustrate these labels in action, consider the following StatefulSet object:
8385
-->
@@ -94,6 +96,7 @@ metadata:
9496
app.kubernetes.io/component: database
9597
app.kubernetes.io/part-of: wordpress
9698
app.kubernetes.io/managed-by: helm
99+
app.kubernetes.io/created-by: controller-manager
97100
```
98101
99102
<!--
@@ -253,5 +256,3 @@ metadata:
253256
With the MySQL `StatefulSet` and `Service` you'll notice information about both MySQL and Wordpress, the broader application, are included.
254257
-->
255258
使用 MySQL `StatefulSet` 和 `Service`,您会注意到有关 MySQL 和 Wordpress 的信息,包括更广泛的应用程序。
256-
257-

content/zh/docs/concepts/overview/working-with-objects/namespaces.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ Kubernetes 支持多个虚拟集群,它们底层依赖于同一个物理集群
3333
Namespaces are intended for use in environments with many users spread across multiple
3434
teams, or projects. For clusters with a few to tens of users, you should not
3535
need to create or think about namespaces at all. Start using namespaces when you
36-
need the features they provide.
36+
need the features they provide.
3737
-->
3838
名字空间适用于存在很多跨多个团队或项目的用户的场景。对于只有几到几十个用户的集群,根本不需要创建或考虑名字空间。当需要名称空间提供的功能时,请开始使用它们。
3939

4040
<!--
4141
Namespaces provide a scope for names. Names of resources need to be unique within a namespace,
42-
but not across namespaces. Namespaces can not be nested inside one another and each Kubernetes
42+
but not across namespaces. Namespaces can not be nested inside one another and each Kubernetes
4343
resource can only be in one namespace.
4444
-->
4545
名字空间为名称提供了一个范围。资源的名称需要在名字空间内是唯一的,但不能跨名字空间。
@@ -71,7 +71,7 @@ for namespaces](/docs/tasks/administer-cluster/namespaces/).
7171
名字空间的创建和删除在[名字空间的管理指南文档](/zh/docs/tasks/administer-cluster/namespaces/)描述。
7272

7373
<!--
74-
Avoid creating namespace with prefix `kube-`, since it is reserved for Kubernetes system namespaces.
74+
Avoid creating namespaces with the prefix `kube-`, since it is reserved for Kubernetes system namespaces.
7575
-->
7676
{{< note >}}
7777
避免使用前缀 `kube-` 创建名字空间,因为它是为 Kubernetes 系统名字空间保留的。
@@ -216,7 +216,7 @@ Kubernetes 控制面会为所有名字空间设置一个不可变更的
216216
`kubernetes.io/metadata.name`,只要 `NamespaceDefaultLabelName` 这一
217217
[特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)
218218
被启用。标签的值是名字空间的名称。
219-
219+
220220
## {{% heading "whatsnext" %}}
221221

222222
<!--
@@ -225,4 +225,3 @@ Kubernetes 控制面会为所有名字空间设置一个不可变更的
225225
-->
226226
* 进一步了解[建立新的名字空间](/zh/docs/tasks/administer-cluster/namespaces/#creating-a-new-namespace)
227227
* 进一步了解[删除名字空间](/zh/docs/tasks/administer-cluster/namespaces/#deleting-a-namespace)
228-

0 commit comments

Comments
 (0)