Skip to content

Commit

Permalink
Merge pull request #38653 from my-git9/zhsync/little
Browse files Browse the repository at this point in the history
[zh-cn] sync some little change
  • Loading branch information
k8s-ci-robot committed Dec 28, 2022
2 parents 8ec6563 + 662dbe2 commit 68773f9
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion content/zh-cn/docs/concepts/architecture/leases.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ weight: 30
<!-- overview -->

<!--
Distrbuted systems often have a need for "leases", which provides a mechanism to lock shared resources and coordinate activity between nodes.
Distributed systems often have a need for "leases", which provides a mechanism to lock shared resources and coordinate activity between nodes.
In Kubernetes, the "lease" concept is represented by `Lease` objects in the `coordination.k8s.io` API group, which are used for system-critical
capabilities like node heart beats and component-level leader election.
-->
Expand Down
8 changes: 6 additions & 2 deletions content/zh-cn/docs/concepts/scheduling-eviction/_index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 调度、抢占和驱逐
weight: 90
weight: 95
content_type: concept
description: >
在 Kubernetes 中,调度 (scheduling) 指的是确保 Pod 匹配到合适的节点,
Expand All @@ -11,7 +11,7 @@ no_list: true

<!--
title: "Scheduling, Preemption and Eviction"
weight: 90
weight: 95
content_type: concept
description: >
In Kubernetes, scheduling refers to making sure that Pods are matched to Nodes
Expand Down Expand Up @@ -46,8 +46,10 @@ of terminating one or more Pods on Nodes.
* [Pod Topology Spread Constraints](/docs/concepts/scheduling-eviction/topology-spread-constraints/)
* [Taints and Tolerations](/docs/concepts/scheduling-eviction/taint-and-toleration/)
* [Scheduling Framework](/docs/concepts/scheduling-eviction/scheduling-framework)
* [Dynamic Resource Allocation](/docs/concepts/scheduling-eviction/dynamic-resource-allocation)
* [Scheduler Performance Tuning](/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
* [Resource Bin Packing for Extended Resources](/docs/concepts/scheduling-eviction/resource-bin-packing/)
* [Pod Scheduling Readiness](/docs/concepts/scheduling-eviction/pod-scheduling-readiness/)
-->

## 调度
Expand All @@ -57,9 +59,11 @@ of terminating one or more Pods on Nodes.
* [Pod 开销](/zh-cn/docs/concepts/scheduling-eviction/pod-overhead/)
* [Pod 拓扑分布约束](/zh-cn/docs/concepts/scheduling-eviction/topology-spread-constraints/)
* [污点和容忍度](/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration/)
* [动态资源分配](/zh-cn/docs/concepts/scheduling-eviction/dynamic-resource-allocation)
* [调度框架](/zh-cn/docs/concepts/scheduling-eviction/scheduling-framework)
* [调度器性能调试](/zh-cn/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
* [扩展资源的资源装箱](/zh-cn/docs/concepts/scheduling-eviction/resource-bin-packing/)
* [Pod 调度就绪](/zh-cn/docs/concepts/scheduling-eviction/pod-scheduling-readiness/)

<!--
## Pod Disruption
Expand Down
2 changes: 1 addition & 1 deletion content/zh-cn/docs/concepts/security/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "安全"
weight: 81
weight: 85
description: 确保云原生工作负载安全的一组概念。
---
2 changes: 1 addition & 1 deletion content/zh-cn/docs/concepts/security/multi-tenancy.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ but Kubernetes policies such as RBAC, quotas, and network policies are essential
<!--
The other major form of multi-tenancy frequently involves a Software-as-a-Service (SaaS) vendor running multiple instances of a workload for customers.
This business model is so strongly associated with this deployment style that many people call it "SaaS tenancy."
However, a better term might be "multi-customer tenancy, since SaaS vendors may also use other deployment models,
However, a better term might be "multi-customer tenancy," since SaaS vendors may also use other deployment models,
and this deployment model can also be used outside of SaaS.
-->
多租户的另一种主要形式通常涉及为客户运行多个工作负载实例的软件即服务 (SaaS) 供应商。
Expand Down
2 changes: 2 additions & 0 deletions content/zh-cn/docs/concepts/storage/storage-limits.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: 特定于节点的卷数限制
content_type: concept
weight: 90
---

<!-- ---
Expand All @@ -11,6 +12,7 @@ reviewers:
- msau42
title: Node-specific Volume Limits
content_type: concept
weight: 90
---
-->

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: 卷健康监测
content_type: concept
weight: 100
---
<!--
reviewers:
Expand All @@ -10,6 +11,7 @@ reviewers:
- xing-yang
title: Volume Health Monitoring
content_type: concept
weight: 100
-->

<!-- overview -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: CSI 卷克隆
content_type: concept
weight: 60
weight: 70
---

<!--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: 卷快照类
content_type: concept
weight: 41 # 置于卷快照章节后
weight: 61 # 置于卷快照章节后
---

<!-- overview -->
Expand Down
4 changes: 2 additions & 2 deletions content/zh-cn/docs/concepts/storage/volume-snapshots.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,12 @@ the `VolumeSnapshotContent` that corresponds to the `VolumeSnapshot`.
到对应 `VolumeSnapshot``VolumeSnapshotContent` 中。

<!--
For pre-provisioned snapshots, `Spec.SourceVolumeMode` needs to be populated
For pre-provisioned snapshots, `spec.SourceVolumeMode` needs to be populated
by the cluster administrator.
An example `VolumeSnapshotContent` resource with this feature enabled would look like:
-->
对于预制备的快照,`Spec.SourceVolumeMode` 需要由集群管理员填充。
对于预制备的快照,`spec.SourceVolumeMode` 需要由集群管理员填充。

启用此特性的 `VolumeSnapshotContent` 资源示例如下所示:

Expand Down

0 comments on commit 68773f9

Please sign in to comment.