Skip to content

Commit ab05b49

Browse files
authored
Merge pull request #49111 from windsonsea/figv1b1
[zh] Sync config-api/kubelet-config.v1beta1.md
2 parents 0118584 + 3328b21 commit ab05b49

File tree

1 file changed

+84
-19
lines changed

1 file changed

+84
-19
lines changed

content/zh-cn/docs/reference/config-api/kubelet-config.v1beta1.md

Lines changed: 84 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ each exec credential provider. Kubelet reads this configuration from disk and en
502502
each provider as specified by the CredentialProvider type.
503503
-->
504504
CredentialProviderConfig 包含有关每个 exec 凭据提供者的配置信息。
505-
Kubelet 从磁盘上读取这些配置信息,并根据 CredentialProvider 类型启用各个提供者。
505+
kubelet 从磁盘上读取这些配置信息,并根据 CredentialProvider 类型启用各个提供者。
506506
</p>
507507

508508
<table class="table">
@@ -540,7 +540,7 @@ auth keys, the value from the provider earlier in this list is used.
540540
<!--
541541
KubeletConfiguration contains the configuration for the Kubelet
542542
-->
543-
KubeletConfiguration 中包含 Kubelet 的配置。
543+
KubeletConfiguration 中包含 kubelet 的配置。
544544
</p>
545545

546546
<table class="table">
@@ -1295,6 +1295,32 @@ Default: &quot;None&quot;
12951295
</td>
12961296
</tr>
12971297

1298+
<tr><td><code>singleProcessOOMKill</code><br/>
1299+
<code>bool</code>
1300+
</td>
1301+
<td>
1302+
<p>
1303+
<!--
1304+
singleProcessOOMKill, if true, will prevent the <code>memory.oom.group</code> flag from being set for container
1305+
cgroups in cgroups v2. This causes processes in the container to be OOM killed individually instead of as
1306+
a group. It means that if true, the behavior aligns with the behavior of cgroups v1.
1307+
The default value is determined automatically when you don't specify.
1308+
On non-linux such as windows, only null / absent is allowed.
1309+
On cgroup v1 linux, only null / absent and true are allowed.
1310+
On cgroup v2 linux, null / absent, true and false are allowed. The default value is false.
1311+
-->
1312+
如果 <code>singleProcessOOMKill</code> 为 true,将阻止在 cgroup v2 中为容器 cgroup
1313+
设置 <code>memory.oom.group</code> 标志。
1314+
这会导致容器中的单个进程因 OOM 被单独杀死,而不是作为一个组被杀死。
1315+
这意味着如果为 true,其行为与 cgroup v1 的行为一致。
1316+
当你未指定值时,默认值将被自动确定。
1317+
在 Windows 这类非 Linux 系统上,仅允许 null(或不设置)。
1318+
在 cgroup v1 Linux 上,仅允许 null(或不设置)和 true。
1319+
在 cgroup v2 Linux 上,允许 null(或不设置)、true 和 false。默认值为 false。
1320+
</p>
1321+
</td>
1322+
</tr>
1323+
12981324
<tr><td><code>cpuManagerPolicyOptions</code><br/>
12991325
<code>map[string]string</code>
13001326
</td>
@@ -1681,8 +1707,8 @@ This field cannot be set if SerializeImagePulls is true.
16811707
Setting it to nil means no limit.
16821708
Default: nil
16831709
-->
1684-
<p>maxParallelImagePulls 设置并行拉取镜像的最大数量。
1685-
如果 serializeImagePulls 为 true,则无法设置此字段。
1710+
<p><code>maxParallelImagePulls</code> 设置并行拉取镜像的最大数量。
1711+
如果 <code>serializeImagePulls</code> 为 true,则无法设置此字段。
16861712
把它设置为 nil 意味着没有限制。</p>
16871713
<p>默认值:nil</p>
16881714
</td>
@@ -1767,17 +1793,11 @@ Default: &quot;5m&quot;
17671793
evictionMaxPodGracePeriod is the maximum allowed grace period (in seconds) to use
17681794
when terminating pods in response to a soft eviction threshold being met. This value
17691795
effectively caps the Pod's terminationGracePeriodSeconds value during soft evictions.
1770-
Note: Due to issue #64530, the behavior has a bug where this value currently just
1771-
overrides the grace period during soft eviction, which can increase the grace
1772-
period from what is set on the Pod. This bug will be fixed in a future release.
17731796
Default: 0
17741797
-->
17751798
<p><code>evictionMaxPodGracePeriod</code> 是指达到软性逐出阈值而引起 Pod 终止时,
17761799
可以赋予的宽限期限最大值(按秒计)。这个值本质上限制了软性逐出事件发生时,
17771800
Pod 可以获得的 <code>terminationGracePeriodSeconds</code>。</p>
1778-
<p>注意:由于 Issue #64530 的原因,系统中存在一个缺陷,即此处所设置的值会在软性逐出时覆盖
1779-
Pod 的宽限期设置,从而有可能增加 Pod 上原本设置的宽限期限时长。
1780-
这个缺陷会在未来版本中修复。</p>
17811801
<p>默认值:0</p>
17821802
</td>
17831803
</tr>
@@ -1981,7 +2001,7 @@ for performing the log rotate operations. Set this count to 1 for disabling the
19812001
concurrent log rotation workflows
19822002
Default: 1</p>
19832003
-->
1984-
<p>containerLogMaxWorkers 指定执行日志轮换操作所需的并发工作程序的最大数量。
2004+
<p><code>containerLogMaxWorkers</code> 指定执行日志轮换操作所需的并发工作程序的最大数量。
19852005
将此计数设置为 1,以禁用并发日志轮换工作流程。
19862006
默认值:1</p>
19872007
</td>
@@ -1998,7 +2018,7 @@ customized to a smaller value based on the log generation rate and the size requ
19982018
rotated against
19992019
Default: 10s</p>
20002020
-->
2001-
<p>ContainerLogMonitorInterval 指定监视容器日志以执行日志轮转操作的持续时间。
2021+
<p><code>containerLogMonitorInterval</code> 指定监视容器日志以执行日志轮转操作的持续时间。
20022022
默认为 10s,但可以根据日志生成率和需要轮换的大小定制为较小的值。
20032023
默认值:10s
20042024
</p>
@@ -2038,13 +2058,13 @@ managers are running. Valid values include:</p>
20382058
systemReserved is a set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G)
20392059
pairs that describe resources reserved for non-kubernetes components.
20402060
Currently only cpu and memory are supported.
2041-
See http://kubernetes.io/docs/user-guide/compute-resources for more detail.
2061+
See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources for more detail.
20422062
Default: nil
20432063
-->
20442064
<p><code>systemReserved</code> 是一组<code>资源名称=资源数量</code>对,
20452065
用来描述为非 Kubernetes 组件预留的资源(例如:'cpu=200m,memory=150G')。</p>
20462066
<p>目前仅支持 CPU 和内存。更多细节可参见
2047-
https://kubernetes.io/zh-cn/docs/concepts/configuration/manage-resources-containers/</p>
2067+
https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/reserve-compute-resources</p>
20482068
<p>默认值:Nil</p>
20492069
</td>
20502070
</tr>
@@ -2057,14 +2077,14 @@ Default: nil
20572077
kubeReserved is a set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs
20582078
that describe resources reserved for kubernetes system components.
20592079
Currently cpu, memory and local storage for root file system are supported.
2060-
See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
2080+
See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources
20612081
for more details.
20622082
Default: nil
20632083
-->
20642084
<p><code>kubeReserved</code> 是一组<code>资源名称=资源数量</code>对,
20652085
用来描述为 Kubernetes 系统组件预留的资源(例如:'cpu=200m,memory=150G')。
20662086
目前支持 CPU、内存和根文件系统的本地存储。
2067-
更多细节可参见 https://kubernetes.io/zh-cn/docs/concepts/configuration/manage-resources-containers/。</p>
2087+
更多细节可参见 https://kubernetes.io/zh-cn/docs/tasks/administer-cluster/reserve-compute-resources</p>
20682088
<p>默认值:Nil</p>
20692089
</td>
20702090
</tr>
@@ -2371,6 +2391,20 @@ Default: nil
23712391
</td>
23722392
</tr>
23732393

2394+
<tr><td><code>crashLoopBackOff</code><br/>
2395+
<a href="#kubelet-config-k8s-io-v1beta1-CrashLoopBackOffConfig"><code>CrashLoopBackOffConfig</code></a>
2396+
</td>
2397+
<td>
2398+
<p>
2399+
<!--
2400+
CrashLoopBackOff contains config to modify node-level parameters for
2401+
container restart behavior
2402+
-->
2403+
<code>crashLoopBackOff</code> 包含修改节点级别参数的配置,用于容器重启行为。
2404+
</p>
2405+
</td>
2406+
</tr>
2407+
23742408
<tr><td><code>reservedMemory</code><br/>
23752409
<a href="#kubelet-config-k8s-io-v1beta1-MemoryReservation"><code>[]MemoryReservation</code></a>
23762410
</td>
@@ -2486,7 +2520,7 @@ Default: 0.8
24862520
</tr>
24872521

24882522
<tr><td><code>registerWithTaints</code><br/>
2489-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#taint-v1-core"><code>[]core/v1.Taint</code></a>
2523+
<a href="https://kubernetes.io/zh-cn/docs/reference/generated/kubernetes-api/v1.32/#taint-v1-core"><code>[]core/v1.Taint</code></a>
24902524
</td>
24912525
<td>
24922526
<!--
@@ -2620,7 +2654,7 @@ SerializedNodeConfigSource 允许对 `v1.NodeConfigSource` 执行序列化操作
26202654
<tr><td><code>kind</code><br/>string</td><td><code>SerializedNodeConfigSource</code></td></tr>
26212655

26222656
<tr><td><code>source</code><br/>
2623-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#nodeconfigsource-v1-core"><code>core/v1.NodeConfigSource</code></a>
2657+
<a href="https://kubernetes.io/zh-cn/docs/reference/generated/kubernetes-api/v1.32/#nodeconfigsource-v1-core"><code>core/v1.NodeConfigSource</code></a>
26242658
</td>
26252659
<td>
26262660
<!--
@@ -2633,6 +2667,37 @@ SerializedNodeConfigSource 允许对 `v1.NodeConfigSource` 执行序列化操作
26332667
</tbody>
26342668
</table>
26352669

2670+
## `CrashLoopBackOffConfig` {#kubelet-config-k8s-io-v1beta1-CrashLoopBackOffConfig}
2671+
2672+
<!--
2673+
**Appears in:**
2674+
-->
2675+
**出现在:**
2676+
2677+
- [KubeletConfiguration](#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
2678+
2679+
<table class="table">
2680+
<thead><tr><th width="30%"><!--Field-->字段</th><th><!--Description-->描述</th></tr></thead>
2681+
<tbody>
2682+
2683+
<tr><td><code>maxContainerRestartPeriod</code><br/>
2684+
<a href="https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration"><code>meta/v1.Duration</code></a>
2685+
</td>
2686+
<td>
2687+
<p>
2688+
<!--
2689+
maxContainerRestartPeriod is the maximum duration the backoff delay can accrue
2690+
to for container restarts, minimum 1 second, maximum 300 seconds. If not set,
2691+
defaults to the internal crashloopbackoff maximum (300s).
2692+
-->
2693+
<code>maxContainerRestartPeriod</code> 是容器重启时回退延迟可以累积的最长持续时间,最短为 1 秒,最长为 300 秒。
2694+
如果不设置,则默认为内部 crashloopbackoff 的最大值(300 秒)。
2695+
</p>
2696+
</td>
2697+
</tr>
2698+
</tbody>
2699+
</table>
2700+
26362701
## `CredentialProvider` {#kubelet-config-k8s-io-v1beta1-CredentialProvider}
26372702

26382703
<!--
@@ -3104,7 +3169,7 @@ MemoryReservation 为每个 NUMA 节点设置不同类型的内存预留。
31043169
</tr>
31053170

31063171
<tr><td><code>limits</code> <B><!-- [Required] -->[必需]</B><br/>
3107-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#resourcelist-v1-core"><code>core/v1.ResourceList</code></a>
3172+
<a href="https://kubernetes.io/zh-cn/docs/reference/generated/kubernetes-api/v1.32/#resourcelist-v1-core"><code>core/v1.ResourceList</code></a>
31083173
</td>
31093174
<td>
31103175
<!--span class="text-muted">No description provided.</span-->

0 commit comments

Comments
 (0)