Skip to content

Commit 19010c0

Browse files
authored
Merge pull request #41017 from my-git9/path-4288
[zh-cn]sync manage-resources-containers secret pod-security-standards
2 parents 95acc1e + d628693 commit 19010c0

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

content/zh-cn/docs/concepts/configuration/manage-resources-containers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ If a node fails, the data in its ephemeral storage can be lost.
457457
Your applications cannot expect any performance SLAs (disk IOPS for example)
458458
from local ephemeral storage.
459459

460-
As a beta feature, Kubernetes lets you track, reserve and limit the amount
460+
Kubernetes lets you track, reserve and limit the amount
461461
of ephemeral local storage a Pod can consume.
462462
-->
463463

@@ -469,7 +469,7 @@ kubelet 也使用此类存储来保存[节点层面的容器日志](/zh-cn/docs/
469469
你的应用不能对本地临时性存储的性能 SLA(例如磁盘 IOPS)作任何假定。
470470
{{< /caution >}}
471471

472-
作为一种 beta 阶段功能特性,Kubernetes 允许你跟踪、预留和限制 Pod
472+
Kubernetes 允许你跟踪、预留和限制 Pod
473473
可消耗的临时性本地存储数量。
474474

475475
<!--

content/zh-cn/docs/concepts/configuration/secret.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,15 @@ method creates a new `Secret` object with the edited data.
279279
280280
Depending on how you created the Secret, as well as how the Secret is used in
281281
your Pods, updates to existing `Secret` objects are propagated automatically to
282-
Pods that use the data. For more information, refer to [Mounted Secrets are updated automatically](#mounted-secrets-are-updated-automatically).
282+
Pods that use the data. For more information, refer to [Using Secrets as files from a Pod](#using-secrets-as-files-from-a-pod) section.
283283
-->
284284
你也可以使用
285285
[Kustomize 工具](/zh-cn/docs/tasks/configmap-secret/managing-secret-using-kustomize/#edit-secret)编辑数据。
286286
然而这种方法会用编辑过的数据创建新的 `Secret` 对象。
287287

288288
根据你创建 Secret 的方式以及该 Secret 在 Pod 中被使用的方式,对已有 `Secret`
289289
对象的更新将自动扩散到使用此数据的 Pod。有关更多信息,
290-
请参阅[自动更新挂载的 Secret](#mounted-secrets-are-updated-automatically)
290+
请参阅[在 Pod 以文件形式使用 Secret](#using-secrets-as-files-from-a-pod)
291291

292292
<!--
293293
### Using a Secret

content/zh-cn/docs/concepts/security/pod-security-standards.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fail validation.
100100
<td style="white-space: nowrap">HostProcess</td>
101101
<td>
102102
<p><!--Windows pods offer the ability to run <a href="/docs/tasks/configure-pod-container/create-hostprocess-pod">HostProcess containers</a> which enables privileged access to the Windows node. Privileged access to the host is disallowed in the baseline policy. -->
103-
Windows Pod 提供了运行 <a href="/zh-cn/docs/tasks/configure-pod-container/create-hostprocess-pod">HostProcess 容器</a> 的能力,这使得对 Windows 节点的特权访问成为可能。Baseline 策略中禁止对宿主的特权访问。{{< feature-state for_k8s_version="v1.23" state="beta" >}}
103+
Windows Pod 提供了运行 <a href="/zh-cn/docs/tasks/configure-pod-container/create-hostprocess-pod">HostProcess 容器</a> 的能力,这使得对 Windows 节点的特权访问成为可能。Baseline 策略中禁止对宿主的特权访问。{{< feature-state for_k8s_version="v1.26" state="stable" >}}
104104
</p>
105105
<p><strong><!--Restricted Fields-->限制的字段</strong></p>
106106
<ul>
@@ -380,7 +380,7 @@ fail validation.
380380
<tr>
381381
<td style="white-space: nowrap"><!--Privilege Escalation (v1.8+)-->特权提升(v1.8+)</td>
382382
<td>
383-
<p><!--Privilege escalation (such as via set-user-ID or set-group-ID file mode) should not be allowed. <em><a href="#policies-specific-to-linux">This is Linux only policy</a> in v1.25+ <code>(spec.os.name != windows)</code></em>-->禁止(通过 SetUID 或 SetGID 文件模式)获得特权提升。<em><a href="#policies-specific-to-linux">这是 v1.25+ 中仅针对 Linux 的策略</a> <code>(spec.os.name != windows)</code></em></p>
383+
<p><!--Privilege escalation (such as via set-user-ID or set-group-ID file mode) should not be allowed. <em><a href="#os-specific-policy-controls">This is Linux only policy</a> in v1.25+ <code>(spec.os.name != windows)</code></em>-->禁止(通过 SetUID 或 SetGID 文件模式)获得特权提升。<em><a href="#policies-specific-to-linux">这是 v1.25+ 中仅针对 Linux 的策略</a> <code>(spec.os.name != windows)</code></em></p>
384384
<p><strong><!--Restricted Fields-->限制的字段</strong></p>
385385
<ul>
386386
<li><code>spec.containers[*].securityContext.allowPrivilegeEscalation</code></li>
@@ -421,7 +421,7 @@ fail validation.
421421
<p><strong><!--Restricted Fields-->限制的字段</strong></p>
422422
<ul>
423423
<li><code>spec.securityContext.runAsUser</code></li>
424-
<li><code>spec.containers[*].securityContext.runAsUser</code></li>
424+
<li><code>spec.containers[*].securityContext.runAsUser</code></li>
425425
<li><code>spec.initContainers[*].securityContext.runAsUser</code></li>
426426
<li><code>spec.ephemeralContainers[*].securityContext.runAsUser</code></li>
427427
</ul>
@@ -435,7 +435,7 @@ fail validation.
435435
<tr>
436436
<td style="white-space: nowrap">Seccomp (v1.19+)</td>
437437
<td>
438-
<p><!--Seccomp profile must be explicitly set to one of the allowed values. Both the <code>Unconfined</code> profile and the <em>absence</em> of a profile are prohibited. <em><a href="#policies-specific-to-linux">This is Linux only policy</a> in v1.25+ <code>(spec.os.name != windows)</code></em>-->Seccomp Profile 必须被显式设置成一个允许的值。禁止使用 <code>Unconfined</code> Profile 或者指定 <em>不存在的</em> Profile。<em><a href="#policies-specific-to-linux">这是 v1.25+ 中仅针对 Linux 的策略</a> <code>(spec.os.name != windows)</code></em></p>
438+
<p><!--Seccomp profile must be explicitly set to one of the allowed values. Both the <code>Unconfined</code> profile and the <em>absence</em> of a profile are prohibited. <em><a href="#os-specific-policy-controls">This is Linux only policy</a> in v1.25+ <code>(spec.os.name != windows)</code></em>-->Seccomp Profile 必须被显式设置成一个允许的值。禁止使用 <code>Unconfined</code> Profile 或者指定 <em>不存在的</em> Profile。<em><a href="#policies-specific-to-linux">这是 v1.25+ 中仅针对 Linux 的策略</a> <code>(spec.os.name != windows)</code></em></p>
439439
<p><strong><!--Restricted Fields-->限制的字段</strong></p>
440440
<ul>
441441
<li><code>spec.securityContext.seccompProfile.type</code></li>
@@ -468,7 +468,7 @@ fail validation.
468468
<p>
469469
<!--
470470
Containers must drop <code>ALL</code> capabilities, and are only permitted to add back
471-
the <code>NET_BIND_SERVICE</code> capability. <em><a href="#policies-specific-to-linux">This is Linux only policy</a> in v1.25+ <code>(.spec.os.name != "windows")</code></em>
471+
the <code>NET_BIND_SERVICE</code> capability. <em><a href="#os-specific-policy-controls">This is Linux only policy</a> in v1.25+ <code>(.spec.os.name != "windows")</code></em>
472472
-->
473473
容器必须弃用 <code>ALL</code> 权能,并且只允许添加
474474
<code>NET_BIND_SERVICE</code> 权能。<em><a href="#policies-specific-to-linux">这是 v1.25+ 中仅针对 Linux 的策略</a> <code>(.spec.os.name != "windows")</code></em>

0 commit comments

Comments
 (0)