Skip to content

Commit 20cbdf2

Browse files
committed
[zh-cn] sync kms-provider configure-multiple-schedulers deprecation-guide
Signed-off-by: xin.li <[email protected]>
1 parent 409af7e commit 20cbdf2

File tree

3 files changed

+56
-48
lines changed

3 files changed

+56
-48
lines changed

content/zh-cn/docs/reference/using-api/deprecation-guide.md

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,36 @@ deprecated API versions to newer and more stable API versions.
3333
-->
3434
## 各发行版本中移除的 API {#removed-apis-by-release}
3535

36+
### v1.32
37+
38+
<!--
39+
The **v1.32** release will stop serving the following deprecated API versions:
40+
-->
41+
**v1.32** 发行版本将停止提供以下已弃用的 API 版本:
42+
43+
<!--
44+
#### Flow control resources {#flowcontrol-resources-v132}
45+
46+
The **flowcontrol.apiserver.k8s.io/v1beta3** API version of FlowSchema and PriorityLevelConfiguration will no longer be served in v1.32.
47+
-->
48+
#### 流控制资源 {#flowcontrol-resources-v132}
49+
50+
FlowSchema 和 PriorityLevelConfiguration 的
51+
**flowcontrol.apiserver.k8s.io/v1beta3** API 版本将不再在 v1.32 中提供。
52+
53+
<!--
54+
* Migrate manifests and API clients to use the **flowcontrol.apiserver.k8s.io/v1** API version, available since v1.29.
55+
* All existing persisted objects are accessible via the new API
56+
* Notable changes in **flowcontrol.apiserver.k8s.io/v1**:
57+
* The PriorityLevelConfiguration `spec.limited.nominalConcurrencyShares` field
58+
only defaults to 30 when unspecified, and an explicit value of 0 is not changed to 30.
59+
-->
60+
* 迁移清单和 API 客户端以使用 **flowcontrol.apiserver.k8s.io/v1** API 版本(自 v1.29 起可用)。
61+
* 所有现有的持久对象都可以通过新的 API 访问。
62+
* **flowcontrol.apiserver.k8s.io/v1** 中的显着变化:
63+
* PriorityLevelConfiguration 的 `spec.limited.nominalConcurrencyShares`
64+
字段仅在未指定时默认为 30,并且显式值 0 时不会更改为 30。
65+
3666
### v1.29
3767

3868
<!--
@@ -48,20 +78,28 @@ The **v1.29** release will stop serving the following deprecated API versions:
4878
<!--
4979
The **flowcontrol.apiserver.k8s.io/v1beta2** API version of FlowSchema and PriorityLevelConfiguration will no longer be served in v1.29.
5080
51-
* Migrate manifests and API clients to use the **flowcontrol.apiserver.k8s.io/v1beta3** API version, available since v1.26.
81+
* Migrate manifests and API clients to use the **flowcontrol.apiserver.k8s.io/v1** API version, available since v1.29, or the **flowcontrol.apiserver.k8s.io/v1beta3** API version, available since v1.26.
5282
* All existing persisted objects are accessible via the new API
83+
* Notable changes in **flowcontrol.apiserver.k8s.io/v1**:
84+
* The PriorityLevelConfiguration `spec.limited.assuredConcurrencyShares` field
85+
is renamed to `spec.limited.nominalConcurrencyShares` and only defaults to 30 when unspecified,
86+
and an explicit value of 0 is not changed to 30.
5387
* Notable changes in **flowcontrol.apiserver.k8s.io/v1beta3**:
5488
* The PriorityLevelConfiguration `spec.limited.assuredConcurrencyShares` field is renamed to `spec.limited.nominalConcurrencyShares`
5589
-->
5690
**flowcontrol.apiserver.k8s.io/v1beta2** API 版本的 FlowSchema
5791
和 PriorityLevelConfiguration 将不会在 v1.29 中提供。
5892

59-
* 迁移清单和 API 客户端使用 **flowcontrol.apiserver.k8s.io/v1beta3** API 版本,
60-
API v1.26 版本开始可用
93+
* 迁移清单和 API 客户端使用 **flowcontrol.apiserver.k8s.io/v1** API 版本(自 v1.29 版本开始可用)
94+
**flowcontrol.apiserver.k8s.io/v1beta3** API 版本(自 v1.26 起可用)
6195
* 所有的已保存的对象都可以通过新的 API 来访问;
96+
* **flowcontrol.apiserver.k8s.io/v1** 中的显着变化:
97+
* PriorityLevelConfiguration 的 `spec.limited.assuredConcurrencyShares`
98+
字段已被重命名为 `spec.limited.nominalConcurrencyShares`,仅在未指定时默认为 30,
99+
并且显式值 0 不会更改为 30。
62100
* **flowcontrol.apiserver.k8s.io/v1beta3** 中需要额外注意的变更:
63101
* PriorityLevelConfiguration 的 `spec.limited.assuredConcurrencyShares`
64-
字段已被更名为 `spec.limited.nominalConcurrencyShares`
102+
字段已被更名为 `spec.limited.nominalConcurrencyShares`
65103

66104
### v1.27
67105

content/zh-cn/docs/tasks/administer-cluster/kms-provider.md

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ KMS v2 does not support the `cachesize` property. All data encryption keys (DEKs
179179
the clear once the server has unwrapped them via a call to the KMS. Once cached, DEKs can be used
180180
to perform decryption indefinitely without making a call to the KMS.
181181
-->
182-
KMS v2 不支持 `cachesize` 属性。一旦服务器通过调用 KMS 解密了数据加密密钥 (DEK)
182+
KMS v2 不支持 `cachesize` 属性。一旦服务器通过调用 KMS 解密了数据加密密钥DEK
183183
所有的 DEK 将会以明文形式被缓存。一旦被缓存,DEK 可以无限期地用于解密操作,而无需再次调用 KMS。
184184

185185
<!--
186186
See [Understanding the encryption at rest configuration.](/docs/tasks/administer-cluster/encrypt-data)
187187
-->
188-
参见[理解静态配置加密](/zh-cn/docs/tasks/administer-cluster/encrypt-data)
188+
参见[理解静态配置加密](/zh-cn/docs/tasks/administer-cluster/encrypt-data)
189189

190190
<!--
191191
## Implementing a KMS plugin
@@ -623,7 +623,7 @@ For details about the `EncryptionConfiguration` format, please check the
623623
[API server encryption API reference](/docs/reference/config-api/apiserver-encryption.v1/).
624624
-->
625625
有关 `EncryptionConfiguration` 格式的更多详细信息,请参阅
626-
[kube-apiserver 加密 API 参考 (v1)](/zh-cn/docs/reference/config-api/apiserver-encryption.v1/).
626+
[kube-apiserver 加密 API 参考(v1)](/zh-cn/docs/reference/config-api/apiserver-encryption.v1/)
627627

628628
<!--
629629
## Verifying that the data is encrypted
@@ -751,43 +751,14 @@ To switch from a local encryption provider to the `kms` provider and re-encrypt
751751
kubectl get secrets --all-namespaces -o json | kubectl replace -f -
752752
```
753753

754-
<!--
755-
## Disabling encryption at rest
756-
757-
To disable encryption at rest:
758-
-->
759-
## 禁用静态数据加密 {#disabling-encryption-at-rest}
760-
761-
要禁用静态数据加密:
762-
763-
<!--
764-
1. Place the `identity` provider as the first entry in the configuration file:
765-
-->
766-
1. 将 `identity` 驱动作为配置文件中的第一个条目:
754+
## {{% heading "whatsnext" %}}
767755

768-
```yaml
769-
apiVersion: apiserver.config.k8s.io/v1
770-
kind: EncryptionConfiguration
771-
resources:
772-
- resources:
773-
- secrets
774-
providers:
775-
- identity: {}
776-
- kms:
777-
apiVersion: v2
778-
name : myKmsPlugin
779-
endpoint: unix:///tmp/socketfile.sock
780-
```
756+
<!-- preserve legacy hyperlinks -->
757+
<a id="disabling-encryption-at-rest" />
781758

782759
<!--
783-
1. Restart all `kube-apiserver` processes.
784-
785-
1. Run the following command to force all secrets to be decrypted.
760+
If you no longer want to use encryption for data persisted in the Kubernetes API, read
761+
[decrypt data that are already stored at rest](/docs/tasks/administer-cluster/decrypt-data/).
786762
-->
787-
2. 重启所有 `kube-apiserver` 进程。
788-
789-
3. 运行下列命令强制重新加密所有 Secret。
790-
791-
```shell
792-
kubectl get secrets --all-namespaces -o json | kubectl replace -f -
793-
```
763+
如果你不想再对 Kubernetes API 中保存的数据加密,
764+
请阅读[解密已静态存储的数据](/zh-cn/docs/tasks/administer-cluster/decrypt-data/)。

content/zh-cn/docs/tasks/extend-kubernetes/configure-multiple-schedulers.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,10 @@ the `kube-scheduler` during initialization with the `--config` option. The `my-s
137137

138138
<!--
139139
In the aforementioned Scheduler Configuration, your scheduler implementation is represented via
140-
a [KubeSchedulerProfile](/docs/reference/config-api/kube-scheduler-config.v1beta3/#kubescheduler-config-k8s-io-v1beta3-KubeSchedulerProfile).
140+
a [KubeSchedulerProfile](/docs/reference/config-api/kube-scheduler-config.v1/#kubescheduler-config-k8s-io-v1-KubeSchedulerProfile).
141141
-->
142142
在前面提到的调度器配置中,你的调度器呈现为一个
143-
[KubeSchedulerProfile](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta3/#kubescheduler-config-k8s-io-v1beta3-KubeSchedulerProfile)
144-
143+
[KubeSchedulerProfile](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1/#kubescheduler-config-k8s-io-v1-KubeSchedulerProfile)
145144
{{< note >}}
146145
<!--
147146
To determine if a scheduler is responsible for scheduling a specific Pod, the `spec.schedulerName` field in a
@@ -164,11 +163,11 @@ Also, note that you create a dedicated service account `my-scheduler` and bind t
164163
Please see the
165164
[kube-scheduler documentation](/docs/reference/command-line-tools-reference/kube-scheduler/) for
166165
detailed description of other command line arguments and
167-
[Scheduler Configuration reference](/docs/reference/config-api/kube-scheduler-config.v1beta3/) for
166+
[Scheduler Configuration reference](/docs/reference/config-api/kube-scheduler-config.v1/) for
168167
detailed description of other customizable `kube-scheduler` configurations.
169168
-->
170169
请参阅 [kube-scheduler 文档](/zh-cn/docs/reference/command-line-tools-reference/kube-scheduler/)
171-
获取其他命令行参数以及 [Scheduler 配置参考](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta3/)
170+
获取其他命令行参数以及 [Scheduler 配置参考](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1/)
172171
获取自定义 `kube-scheduler` 配置的详细说明。
173172

174173
<!--

0 commit comments

Comments
 (0)