Skip to content

Commit ac64f73

Browse files
committed
[zh-cn] sync secrets-good-practices download apiserver-encryption.v1.md
Signed-off-by: xin.li <xin.li@daocloud.io>
1 parent 195465c commit ac64f73

File tree

3 files changed

+67
-33
lines changed

3 files changed

+67
-33
lines changed

content/zh-cn/docs/concepts/security/secrets-good-practices.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ application developers. Use these guidelines to improve the security of your
2424
sensitive information in Secret objects, as well as to more effectively manage
2525
your Secrets.
2626
-->
27-
以下良好实践适用于集群管理员和应用开发者。遵从这些指导方针有助于提高 Secret 对象中敏感信息的安全性,
28-
还可以更有效地管理你的 Secret。
27+
以下良好实践适用于集群管理员和应用开发者。遵从这些指导方针有助于提高 Secret
28+
对象中敏感信息的安全性,还可以更有效地管理你的 Secret。
2929

3030
<!-- body -->
3131

@@ -112,6 +112,20 @@ recommendations include:
112112
* 使用生命期短暂的 Secret
113113
* 实现对特定事件发出警报的审计规则,例如同一用户并发读取多个 Secret 时发出警报
114114

115+
<!--
116+
#### Additional ServiceAccount annotations for Secret management
117+
118+
You can also use the `kubernetes.io/enforce-mountable-secrets` annotation on
119+
a ServiceAccount to enforce specific rules on how Secrets are used in a Pod.
120+
For more details, see the [documentation on this annotation](/docs/reference/labels-annotations-taints/#enforce-mountable-secrets).
121+
-->
122+
#### 用于 Secret 管理的附加 ServiceAccount 注解
123+
124+
你还可以在 ServiceAccount 上使用 `kubernetes.io/enforce-mountable-secrets`
125+
注解来强制执行有关如何在 Pod 中使用 Secret 的特定规则。
126+
127+
更多详细信息,请参阅[有关此注解的文档](/zh-cn/docs/reference/labels-annotations-taints/#enforce-mountable-secrets)
128+
115129
<!--
116130
### Improve etcd management policies
117131

content/zh-cn/docs/reference/config-api/apiserver-encryption.v1.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: kube-apiserver 加密配置 (v1)
2+
title: kube-apiserver 加密配置(v1)
33
content_type: tool-reference
44
package: apiserver.config.k8s.io/v1
55
auto_generated: true
@@ -29,8 +29,8 @@ Package v1 is the v1 version of the API.
2929
## `EncryptionConfiguration` {#apiserver-config-k8s-io-v1-EncryptionConfiguration}
3030

3131
<!--
32-
Use '<em>.<!!-- raw HTML omitted -->' to encrypt all resources within a group or '</em>.<em>' to encrypt all resources.
33-
'</em>.' can be used to encrypt all resource in the core group. '<em>.</em>' will encrypt all
32+
Use '&ast;&lt;group&gt;o encrypt all resources within a group or '&ast;.&ast;' to encrypt all resources.
33+
'&ast;.' can be used to encrypt all resource in the core group. '&ast;.&ast;' will encrypt all
3434
resources, even custom resources that are added after API server start.
3535
Use of wildcards that overlap within the same resource list or across multiple
3636
entries are not allowed since part of the configuration would be ineffective.
@@ -232,7 +232,7 @@ KMSConfiguration 包含基于 KMS 的封套转换器的名称、缓存大小以
232232
<!--
233233
timeout for gRPC calls to kms-plugin (ex. 5s). The default is 3 seconds.
234234
-->
235-
对 KMS 插件执行 gRPC 调用的超时时长(例如'5s')。默认值为 3 秒。
235+
对 KMS 插件执行 gRPC 调用的超时时长(例如'5s')。默认值为 3 秒。
236236
</p>
237237
</td>
238238
</tr>
@@ -398,9 +398,9 @@ ResourceConfiguration 中保存资源配置。
398398
<!--
399399
resources is a list of kubernetes resources which have to be encrypted. The resource names are derived from <code>resource</code> or <code>resource.group</code> of the group/version/resource.
400400
eg: pandas.awesome.bears.example is a custom resource with 'group': awesome.bears.example, 'resource': pandas.
401-
Use '<em>.</em>' to encrypt all resources and '<em>.< raw HTML omitted >' to encrypt all resources in a specific group.
402-
eg: '</em>.awesome.bears.example' will encrypt all resources in the group 'awesome.bears.example'.
403-
eg: '*.' will encrypt all resources in the core group (such as pods, configmaps, etc).</p>
401+
Use '&ast;.&ast;' to encrypt all resources and '&ast;.&lt;group&gt;' to encrypt all resources in a specific group.
402+
eg: '&ast;.awesome.bears.example' will encrypt all resources in the group 'awesome.bears.example'.
403+
eg: '&ast;.' will encrypt all resources in the core group (such as pods, configmaps, etc).</p>
404404
-->
405405
<code>resources</code> 是必须要加密的 Kubernetes 资源的列表。
406406
资源名称来自于组/版本/资源的 <code>resource</code> 或 <code>resource.group</code>。
@@ -457,7 +457,7 @@ SecretboxConfiguration 包含用于某 Secretbox 转换器的 API 配置。
457457
keys is a list of keys to be used for creating the Secretbox transformer.
458458
Each key has to be 32 bytes long.
459459
-->
460-
<code>keys</code> 是一个密钥列表,用来创建 Secretbox 转换器。每个密钥必须是 32 字节长
460+
<code>keys</code> 是一个密钥列表,用来创建 Secretbox 转换器。每个密钥长度必须是 32 字节
461461
</p>
462462
</td>
463463
</tr>

content/zh-cn/releases/download.md

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ kubectl 可安装在各种 Linux 平台、macOS 和 Windows 上。
5555
- [在 Windows 上安装 kubectl](/zh-cn/docs/tasks/tools/install-kubectl-windows)
5656

5757
<!--
58-
## Container Images
58+
## Container images
5959
6060
All Kubernetes container images are deployed to the
6161
`registry.k8s.io` container image registry.
@@ -64,39 +64,59 @@ All Kubernetes container images are deployed to the
6464

6565
所有 Kubernetes 容器镜像都被部署到 `registry.k8s.io` 容器镜像仓库。
6666

67-
{{< feature-state for_k8s_version="v1.24" state="alpha" >}}
68-
6967
<!--
70-
For Kubernetes {{< param "version" >}}, the following
71-
container images are signed using [cosign](http://github.com/sigstore/cosign)
72-
signatures:
68+
| Container Image | Supported Architectures |
7369
-->
74-
对于 Kubernetes {{< param "version" >}},以下容器镜像使用
75-
[cosign](http://github.com/sigstore/cosign) 进行签名:
76-
77-
<!--
78-
| Container Image | Supported Architectures |
79-
-->
80-
| 容器镜像 | 支持架构 |
81-
| ------------------------------------------------------------------- | --------------------------------- |
70+
| 容器镜像 | 支持架构 |
71+
| ------------------------------------------------------------------------- | --------------------------------- |
8272
| registry.k8s.io/kube-apiserver:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
8373
| registry.k8s.io/kube-controller-manager:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
8474
| registry.k8s.io/kube-proxy:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
8575
| registry.k8s.io/kube-scheduler:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
8676
| registry.k8s.io/conformance:v{{< skew currentPatchVersion >}} | amd64, arm, arm64, ppc64le, s390x |
8777

78+
<!--
79+
### Container image architectures
80+
-->
81+
### 容器镜像架构
82+
8883
<!--
8984
All container images are available for multiple architectures, whereas the
9085
container runtime should choose the correct one based on the underlying
9186
platform. It is also possible to pull a dedicated architecture by suffixing the
9287
container image name, for example
93-
`registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`. All
94-
those derivations are signed in the same way as the multi-architecture manifest lists.
88+
`registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`.
9589
-->
9690
所有容器镜像都支持多架构,而容器运行时应根据下层平台选择正确的镜像。
9791
也可以通过给容器镜像名称加后缀来拉取适合特定架构的镜像,例如
9892
`registry.k8s.io/kube-apiserver-arm64:v{{< skew currentPatchVersion >}}`
99-
所有这些派生镜像都以与多架构清单列表相同的方式签名。
93+
94+
<!--
95+
### Container image signatures
96+
-->
97+
### 容器镜像签名
98+
99+
{{< feature-state for_k8s_version="v1.26" state="beta" >}}
100+
101+
<!--
102+
For Kubernetes {{< param "version" >}},
103+
container images are signed using [sigstore](http://sigstore.dev)
104+
signatures:
105+
-->
106+
对于 Kubernetes {{< param "version" >}},容器镜像使用
107+
[sigstore](http://sigstore.dev) 进行签名:
108+
109+
{{< note >}}
110+
<!--
111+
Container image sigstore signatures do currently not match between different geographical locations.
112+
More information about this problem is available in the corresponding
113+
[GitHub issue](http://github.com/kubernetes/registry.k8s.io/issues/187).
114+
-->
115+
目前,不同地理位置之间的容器镜像 sigstore 签名不匹配。
116+
有关此问题的更多信息,请参阅相应的
117+
[GitHub Issue](http://github.com/kubernetes/registry.k8s.io/issues/187)
118+
{{< /note >}}
119+
100120

101121
<!--
102122
The Kubernetes project publishes a list of signed Kubernetes container images
@@ -111,18 +131,18 @@ curl -Ls "http://sbom.k8s.io/$(curl -Ls http://dl.k8s.io/release/stable.txt)/r
111131
```
112132

113133
<!--
114-
For Kubernetes v{{< skew currentVersion >}}, the only kind of code artifact that
115-
you can verify integrity for is a container image, using the experimental
116-
signing support.
117-
118134
To manually verify signed container images of Kubernetes core components, refer to
119135
[Verify Signed Container Images](/docs/tasks/administer-cluster/verify-signed-artifacts).
120136
-->
121-
对于 Kubernetes v{{< skew currentVersion >}},唯一可以验证完整性的代码工件就是容器镜像,它使用实验性签名支持。
122-
123137
如需手动验证 Kubernetes 核心组件的签名容器镜像,
124138
请参考[验证签名容器镜像](/zh-cn/docs/tasks/administer-cluster/verify-signed-artifacts)
125139

140+
<!--
141+
If you pull a container image for a specific architecture, the single-architecture image
142+
is signed in the same way as for the multi-architecture manifest lists.
143+
-->
144+
如果你要拉取特定架构的容器镜像,则单架构镜像的签名方式与多架构清单列表相同。
145+
126146
<!--
127147
## Binaries
128148
-->

0 commit comments

Comments
 (0)