Skip to content

Commit 90338cd

Browse files
authored
Merge pull request #44063 from asa3311/sync-zh-85
[zh] sync secret node-pressure-eviction issue-wrangler
2 parents 629528b + 6856308 commit 90338cd

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,6 +1579,21 @@ Therefore, one Pod does not have access to the Secrets of another Pod.
15791579
针对同一节点上的多个 Pod 可能有多个 Secret。不过,只有某个 Pod 所请求的 Secret
15801580
才有可能对 Pod 中的容器可见。因此,一个 Pod 不会获得访问其他 Pod 的 Secret 的权限。
15811581

1582+
<!--
1583+
### Configure least-privilege access to Secrets
1584+
1585+
To enhance the security measures around Secrets, Kubernetes provides a mechanism: you can
1586+
annotate a ServiceAccount as `kubernetes.io/enforce-mountable-secrets: "true"`.
1587+
1588+
For more information, you can refer to the [documentation about this annotation](/docs/concepts/security/service-accounts/#enforce-mountable-secrets).
1589+
-->
1590+
### 配置 Secret 资源的最小特权访问
1591+
1592+
为了加强对 Secret 的安全措施,Kubernetes 提供了一种机制:
1593+
你可以为 ServiceAccount 添加 `kubernetes.io/enforce-mountable-secrets: "true"` 注解。
1594+
1595+
想了解更多信息,你可以参考[此注解的文档](/zh-cn/docs/concepts/security/service-accounts/#enforce-mountable-secrets)。
1596+
15821597
{{< warning >}}
15831598
<!--
15841599
Any containers that run with `privileged: true` on a node can access all

content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ like `free -m`. This is important because `free -m` does not work in a
158158
container, and if users use the [node allocatable](/docs/tasks/administer-cluster/reserve-compute-resources/#node-allocatable)
159159
feature, out of resource decisions
160160
are made local to the end user Pod part of the cgroup hierarchy as well as the
161-
root node. This [script](/examples/admin/resource/memory-available.sh)
161+
root node. This [script](/examples/admin/resource/memory-available.sh) or
162+
[cgroupv2 script](/examples/admin/resource/memory-available-cgroupv2.sh)
162163
reproduces the same set of steps that the kubelet performs to calculate
163164
`memory.available`. The kubelet excludes inactive_file (the number of bytes of
164165
file-backed memory on inactive LRU list) from its calculation as it assumes that
@@ -168,7 +169,8 @@ memory is reclaimable under pressure.
168169
这很重要,因为 `free -m` 在容器中不起作用,如果用户使用
169170
[节点可分配资源](/zh-cn/docs/tasks/administer-cluster/reserve-compute-resources/#node-allocatable)
170171
这一功能特性,资源不足的判定是基于 cgroup 层次结构中的用户 Pod 所处的局部及 cgroup 根节点作出的。
171-
这个[脚本](/zh-cn/examples/admin/resource/memory-available.sh)
172+
这个[脚本](/zh-cn/examples/admin/resource/memory-available.sh)或者
173+
[cgroupv2 脚本](/zh-cn/examples/admin/resource/memory-available-cgroupv2.sh)
172174
重现了 kubelet 为计算 `memory.available` 而执行的相同步骤。
173175
kubelet 在其计算中排除了 inactive_file(非活动 LRU 列表上基于文件来虚拟的内存的字节数),
174176
因为它假定在压力下内存是可回收的。

content/zh-cn/docs/contribute/participate/issue-wrangler.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ weight: 20
1414
<!--
1515
Alongside the [PR Wrangler](/docs/contribute/participate/pr-wranglers),formal approvers,
1616
and reviewers, members of SIG Docs take week long shifts
17-
[triaging and categorising issues](/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
17+
[triaging and categorising issues](/docs/contribute/review/for-approvers/#triage-and-categorize-issues)
1818
for the repository.
1919
-->
2020
除了承担 [PR 管理者](/zh-cn/docs/contribute/participate/pr-wranglers)的职责外,
2121
SIG Docs 正式的批准人(Approver)、评审人(Reviewer)和成员(Member)
22-
按周轮流[归类仓库的 Issue](/zh-cn/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
22+
按周轮流[归类仓库的 Issue](/zh-cn/docs/contribute/review/for-approvers/#triage-and-categorize-issues)
2323

2424
<!-- body -->
2525

@@ -29,7 +29,7 @@ SIG Docs 正式的批准人(Approver)、评审人(Reviewer)和成员(M
2929
Each day in a week-long shift the Issue Wrangler will be responsible for:
3030
3131
- Triaging and tagging incoming issues daily. See
32-
[Triage and categorize issues](/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
32+
[Triage and categorize issues](/docs/contribute/review/for-approvers/#triage-and-categorize-issues)
3333
for guidelines on how SIG Docs uses metadata.
3434
- Keeping an eye on stale & rotten issues within the kubernetes/website repository.
3535
- Maintenance of the [Issues board](https://github.com/orgs/kubernetes/projects/72/views/1).
@@ -39,7 +39,7 @@ Each day in a week-long shift the Issue Wrangler will be responsible for:
3939
在为期一周的轮值期内,Issue 管理者每天负责:
4040

4141
- 对收到的 Issue 进行日常分类和标记。有关 SIG Docs 如何使用元数据的指导说明,
42-
参阅[归类 Issue](/zh-cn/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
42+
参阅[归类 Issue](/zh-cn/docs/contribute/review/for-approvers/#triage-and-categorize-issues)
4343
- 密切关注 kubernetes/website 代码仓库中陈旧和过期的 Issue。
4444
- 维护 [Issues 看板](https://github.com/orgs/kubernetes/projects/72/views/1)
4545

0 commit comments

Comments
 (0)