Skip to content

Commit 7396667

Browse files
committed
[zh-cn] sync volume-attributes-classes.md install-kubectl-linux.md
Signed-off-by: xin.li <[email protected]>
1 parent 4d66f8b commit 7396667

File tree

2 files changed

+79
-24
lines changed

2 files changed

+79
-24
lines changed

content/zh-cn/docs/concepts/storage/volume-attributes-classes.md

+38-20
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ weight: 40
1414

1515
<!-- overview -->
1616

17-
{{< feature-state for_k8s_version="v1.29" state="alpha" >}}
17+
{{< feature-state feature_gate_name="VolumeAttributesClass" >}}
1818

1919
<!--
2020
This page assumes that you are familiar with [StorageClasses](/docs/concepts/storage/storage-classes/),
@@ -30,26 +30,40 @@ in Kubernetes.
3030
<!--
3131
A VolumeAttributesClass provides a way for administrators to describe the mutable
3232
"classes" of storage they offer. Different classes might map to different quality-of-service levels.
33-
Kubernetes itself is unopinionated about what these classes represent.
33+
Kubernetes itself is un-opinionated about what these classes represent.
3434
35-
This is an alpha feature and disabled by default.
35+
This is a beta feature and disabled by default.
3636
37-
If you want to test the feature whilst it's alpha, you need to enable the `VolumeAttributesClass`
38-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/) for the kube-controller-manager and the kube-apiserver. You use the `--feature-gates` command line argument:
37+
If you want to test the feature whilst it's beta, you need to enable the `VolumeAttributesClass`
38+
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/) for the kube-controller-manager
39+
and the kube-apiserver. You use the `--feature-gates` command line argument:
3940
-->
4041
卷属性类(VolumeAttributesClass)为管理员提供了一种描述可变更的存储“类”的方法。
4142
不同的类可以映射到不同的服务质量级别。Kubernetes 本身不关注这些类代表什么。
4243

43-
这是一个 Alpha 特性,默认被禁用。
44+
这是一个 Beta 特性,默认被禁用。
4445

45-
如果你想测试这一处于 Alpha 阶段的特性,你需要为 kube-controller-manager 和 kube-apiserver 启用
46+
如果你想测试这一处于 Beta 阶段的特性,你需要为 kube-controller-manager 和 kube-apiserver 启用
4647
`VolumeAttributesClass` [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)
4748
你可以使用 `--feature-gates` 命令行参数:
4849

49-
```
50+
```shell
5051
--feature-gates="...,VolumeAttributesClass=true"
5152
```
5253

54+
<!--
55+
You will also have to enable the `storage.k8s.io/v1beta1` API group through the
56+
`kube-apiserver` [runtime-config](https://kubernetes.io/docs/tasks/administer-cluster/enable-disable-api/).
57+
You use the following command line argument:
58+
-->
59+
你还必须通过 `kube-apiserver`
60+
[运行时配置](/zh-cn/docs/tasks/administer-cluster/enable-disable-api/)启用
61+
`storage.k8s.io/v1beta1` API 组:
62+
63+
```shell
64+
--runtime-config=storage.k8s.io/v1beta1=true
65+
```
66+
5367
<!--
5468
You can also only use VolumeAttributesClasses with storage backed by
5569
{{< glossary_tooltip text="Container Storage Interface" term_id="csi" >}}, and only where the
@@ -80,7 +94,7 @@ VolumeAttributesClass 对象的名称比较重要,用户用对象名称来请
8094
但现有类中的参数是不可变的。
8195

8296
```yaml
83-
apiVersion: storage.k8s.io/v1alpha1
97+
apiVersion: storage.k8s.io/v1beta1
8498
kind: VolumeAttributesClass
8599
metadata:
86100
name: silver
@@ -90,13 +104,14 @@ parameters:
90104
provisioned-throughput: "50"
91105
```
92106
93-
94107
<!--
95108
### Provisioner
96109
97-
Each VolumeAttributesClass has a provisioner that determines what volume plugin is used for provisioning PVs. The field `driverName` must be specified.
110+
Each VolumeAttributesClass has a provisioner that determines what volume plugin is used for
111+
provisioning PVs. The field `driverName` must be specified.
98112

99-
The feature support for VolumeAttributesClass is implemented in [kubernetes-csi/external-provisioner](https://github.com/kubernetes-csi/external-provisioner).
113+
The feature support for VolumeAttributesClass is implemented in
114+
[kubernetes-csi/external-provisioner](https://github.com/kubernetes-csi/external-provisioner).
100115
-->
101116
### 存储制备器 {#provisioner}
102117

@@ -107,7 +122,8 @@ The feature support for VolumeAttributesClass is implemented in [kubernetes-csi/
107122
[kubernetes-csi/external-provisioner](https://github.com/kubernetes-csi/external-provisioner) 中实现。
108123

109124
<!--
110-
You are not restricted to specifying the [kubernetes-csi/external-provisioner](https://github.com/kubernetes-csi/external-provisioner). You can also run and specify external provisioners,
125+
You are not restricted to specifying the [kubernetes-csi/external-provisioner](https://github.com/kubernetes-csi/external-provisioner).
126+
You can also run and specify external provisioners,
111127
which are independent programs that follow a specification defined by Kubernetes.
112128
Authors of external provisioners have full discretion over where their code lives, how
113129
the provisioner is shipped, how it needs to be run, what volume plugin it uses, etc.
@@ -119,11 +135,13 @@ the provisioner is shipped, how it needs to be run, what volume plugin it uses,
119135
<!--
120136
### Resizer
121137

122-
Each VolumeAttributesClass has a resizer that determines what volume plugin is used for modifying PVs. The field `driverName` must be specified.
138+
Each VolumeAttributesClass has a resizer that determines what volume plugin is used
139+
for modifying PVs. The field `driverName` must be specified.
123140

124-
The modifying volume feature support for VolumeAttributesClass is implemented in [kubernetes-csi/external-resizer](https://github.com/kubernetes-csi/external-resizer).
141+
The modifying volume feature support for VolumeAttributesClass is implemented in
142+
[kubernetes-csi/external-resizer](https://github.com/kubernetes-csi/external-resizer).
125143

126-
For example, a existing PersistentVolumeClaim is using a VolumeAttributesClass named silver:
144+
For example, an existing PersistentVolumeClaim is using a VolumeAttributesClass named silver:
127145
-->
128146
### 调整器 {#resizer}
129147

@@ -152,7 +170,7 @@ A new VolumeAttributesClass gold is available in the cluster:
152170
集群中有一个新的名为 gold 的 VolumeAttributesClass:
153171

154172
```yaml
155-
apiVersion: storage.k8s.io/v1alpha1
173+
apiVersion: storage.k8s.io/v1beta1
156174
kind: VolumeAttributesClass
157175
metadata:
158176
name: gold
@@ -183,10 +201,10 @@ spec:
183201

184202
VolumeAttributeClasses have parameters that describe volumes belonging to them. Different parameters may be accepted
185203
depending on the provisioner or the resizer. For example, the value `4000`, for the parameter `iops`,
186-
and the parameter `throughput` are specific to GCE PD.
204+
and the parameter `throughput` are specific to GCE PD.
187205
When a parameter is omitted, the default is used at volume provisioning.
188-
If a user apply the PVC with a different VolumeAttributesClass with omitted parameters, the default value of
189-
the parameters may be used depends on the CSI driver implementation.
206+
If a user applies the PVC with a different VolumeAttributesClass with omitted parameters, the default value of
207+
the parameters may be used depending on the CSI driver implementation.
190208
Please refer to the related CSI driver documentation for more details.
191209
-->
192210
## 参数 {#parameters}

content/zh-cn/docs/tasks/tools/install-kubectl-linux.md

+41-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following methods exist for installing kubectl on Linux:
4747
<!--
4848
### Install kubectl binary with curl on Linux
4949
-->
50-
### 用 curl 在 Linux 系统中安装 kubectl {#install-kubectl-binary-with-curl-on-linux}
50+
### 用 curl 在 Linux 系统中安装 kubectl {#install-kubectl-binary-with-curl-on-linux}
5151

5252
<!--
5353
1. Download the latest release with the command:
@@ -145,7 +145,7 @@ The following methods exist for installing kubectl on Linux:
145145
<!--
146146
1. Install kubectl
147147
-->
148-
3. 安装 kubectl
148+
3. 安装 kubectl
149149

150150
```bash
151151
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
@@ -380,9 +380,46 @@ To upgrade kubectl to another minor release, you'll need to bump the version in
380380
{{< /note >}}
381381
382382
<!--
383-
2. Install kubectl using `zypper`:
383+
2. Update `zypper` and confirm the new repo addition:
384384
-->
385-
2. 使用 `zypper` 安装 kubectl:
385+
2. 更新 zypper 并确认新的仓库已添加:
386+
387+
```bash
388+
sudo zypper update
389+
```
390+
391+
<!--
392+
When this message appears, press 't' or 'a':
393+
-->
394+
出现此信息时,按 't''a''
395+
396+
```
397+
New repository or package signing key received:
398+
399+
Repository: Kubernetes
400+
Key Fingerprint: 1111 2222 3333 4444 5555 6666 7777 8888 9999 AAAA
401+
Key Name: isv:kubernetes OBS Project <isv:[email protected]>
402+
Key Algorithm: RSA 2048
403+
Key Created: Thu 25 Aug 2022 01:21:11 PM -03
404+
Key Expires: Sat 02 Nov 2024 01:21:11 PM -03 (expires in 85 days)
405+
Rpm Name: gpg-pubkey-9a296436-6307a177
406+
407+
Note: Signing data enables the recipient to verify that no modifications occurred after the data
408+
were signed. Accepting data with no, wrong or unknown signature can lead to a corrupted system
409+
and in extreme cases even to a system compromise.
410+
411+
Note: A GPG pubkey is clearly identified by its fingerprint. Do not rely on the key's name. If
412+
you are not sure whether the presented key is authentic, ask the repository provider or check
413+
their web site. Many providers maintain a web page showing the fingerprints of the GPG keys they
414+
are using.
415+
416+
Do you want to reject the key, trust temporarily, or trust always? [r/t/a/?] (r): a
417+
```
418+
419+
<!--
420+
3. Install kubectl using `zypper`:
421+
-->
422+
3. 使用 `zypper` 安装 kubectl:
386423
387424
```bash
388425
sudo zypper install -y kubectl

0 commit comments

Comments
 (0)