Skip to content

Commit d0abaa2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #33550 from nameYULI/yl20
[zh]Sync reference-2
2 parents 2fec117 + 678305c commit d0abaa2

File tree

3 files changed

+125
-32
lines changed

3 files changed

+125
-32
lines changed

‎content/zh/docs/reference/kubernetes-api/common-definitions/node-selector-requirement.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,11 @@ A node selector requirement is a selector that contains values, a key, and an op
4646
- **operator** (string), required
4747
4848
Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
49-
50-
Possible enum values:
51-
- `"DoesNotExist"`
52-
- `"Exists"`
53-
- `"Gt"`
54-
- `"In"`
55-
- `"Lt"`
56-
- `"NotIn"`
5749
-->
5850
- **operator** (string), 必选
5951

6052
表示键与一组值的关系的运算符。有效的运算符包括：In、NotIn、Exists、DoesNotExist、Gt 和 Lt。
6153

62-
可选值:
63-
- `"DoesNotExist"`
64-
- `"Exists"`
65-
- `"Gt"`
66-
- `"In"`
67-
- `"Lt"`
68-
- `"NotIn"`
69-
7054
<!--
7155
- **values** ([]string)
7256

‎content/zh/docs/reference/labels-annotations-taints/audit-annotations.md

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,72 @@ See [Auditing](/docs/tasks/debug/debug-cluster/audit/) for more information.
133133

134134
此注解给出了 Kubernetes 审计日志中 [decision](#authorization-k8s-io-decision) 的原因。
135135

136-
有关详细信息，请参阅[审计](/zh/docs/tasks/debug/debug-cluster/audit/)。
136+
有关详细信息，请参阅[审计](/zh/docs/tasks/debug/debug-cluster/audit/)。
137+
138+
## missing-san.invalid-cert.kubernetes.io/$hostname
139+
140+
<!--
141+
Example: `missing-san.invalid-cert.kubernetes.io/example-svc.example-namespace.svc: "relies on a legacy Common Name field instead of the SAN extension for subject validation"`
142+
143+
Used by Kubernetes version v1.24 and later
144+
-->
145+
例子：`missing-san.invalid-cert.kubernetes.io/example-svc.example-namespace.svc: "relies on a legacy Common Name field instead of the SAN extension for subject validation"`
146+
147+
由 Kubernetes v1.24 及更高版本使用
148+
149+
<!--
150+
This annotation indicates a webhook or aggregated API server
151+
is using an invalid certificate that is missing `subjectAltNames`.
152+
Support for these certificates was disabled by default in Kubernetes 1.19,
153+
and removed in Kubernetes 1.23.
154+
-->
155+
此注解表示 webhook 或聚合 API 服务器正在使用缺少 `subjectAltNames` 的无效证书。
156+
Kubernetes 1.19 已经默认禁用，且 Kubernetes 1.23 已经移除对这些证书的支持。
157+
158+
<!--
159+
Requests to endpoints using these certificates will fail.
160+
Services using these certificates should replace them as soon as possible
161+
to avoid disruption when running in Kubernetes 1.23+ environments.
162+
-->
163+
使用这些证书向端点发出的请求将失败。
164+
使用这些证书的服务应尽快替换它们，以避免在 Kubernetes 1.23+ 环境中运行时中断。
165+
166+
<!--
167+
There's more information about this in the Go documentation:
168+
[X.509 CommonName deprecation](https://go.dev/doc/go1.15#commonname).
169+
-->
170+
Go 文档中有更多关于此的信息：
171+
[X.509 CommonName 弃用](https://go.dev/doc/go1.15#commonname)。
172+
173+
## insecure-sha1.invalid-cert.kubernetes.io/$hostname
174+
175+
<!--
176+
Example: `insecure-sha1.invalid-cert.kubernetes.io/example-svc.example-namespace.svc: "uses an insecure SHA-1 signature"`
177+
Used by Kubernetes version v1.24 and later
178+
-->
179+
180+
例子：`insecure-sha1.invalid-cert.kubernetes.io/example-svc.example-namespace.svc: "uses an insecure SHA-1 signature"`
181+
182+
由 Kubernetes v1.24 及更高版本使用
183+
184+
<!--
185+
This annotation indicates a webhook or aggregated API server
186+
is using an insecure certificate signed with a SHA-1 hash.
187+
Support for these insecure certificates is disabled by default in Kubernetes 1.24,
188+
and will be removed in a future release.
189+
-->
190+
此注解表示 webhook 或聚合 API 服务器正在使用使用 SHA-1 签名的不安全证书。
191+
Kubernetes 1.24 已经默认禁用，并将在未来的版本中删除对这些证书的支持。
192+
193+
<!--
194+
Services using these certificates should replace them as soon as possible,
195+
to ensure connections are secured properly and to avoid disruption in future releases.
196+
-->
197+
使用这些证书的服务应尽快替换它们，以确保正确保护连接并避免在未来版本中出现中断。
198+
199+
<!--
200+
There's more information about this in the Go documentation:
201+
[Rejecting SHA-1 certificates](https://go.dev/doc/go1.18#sha1).
202+
-->
203+
Go 文档中有更多关于此的信息：
204+
[拒绝 SHA-1 证书](https://go.dev/doc/go1.18#sha1)。

‎content/zh/docs/reference/tools/_index.md

Lines changed: 56 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,22 @@ no_list: true
1616

1717
<!-- overview -->
1818
<!--
19-
Kubernetes contains several built-in tools to help you work with the Kubernetes system.
19+
Kubernetes contains several tools to help you work with the Kubernetes system.
2020
-->
21-
Kubernetes 包含多个内置工具来帮助你使用 Kubernetes 系统。
21+
Kubernetes 包含多种工具来帮助你使用 Kubernetes 系统。
2222

2323

2424
<!-- body -->
2525

2626
<!--
27-
## Minikube
28-
29-
[`minikube`](https://minikube.sigs.k8s.io/docs/) is a tool that
30-
runs a single-node Kubernetes cluster locally on your workstation for
31-
development and testing purposes.
27+
[`crictl`](https://github.com/kubernetes-sigs/cri-tools) is a command-line
28+
interface for inspecting and debugging {{<glossary_tooltip term_id="cri" text="CRI">}}-compatible
29+
container runtimes.
3230
-->
33-
## Minikube
31+
## crictl
3432

35-
[`minikube`](https://minikube.sigs.k8s.io/docs/)
36-
是一种在你的工作站上本地运行单节点 Kubernetes 集群的工具，用于开发和测试。
33+
[`crictl`](https://github.com/kubernetes-sigs/cri-tools)
34+
是用于检查和调试兼容 {{<glossary_tooltip term_id="cri" text="CRI">}} 的容器运行时的命令行接口。
3735

3836
<!--
3937
## Dashboard
@@ -51,13 +49,14 @@ to a Kubernetes cluster, troubleshoot them, and manage the cluster and its resou
5149
<!--
5250
## Helm
5351
54-
[`Kubernetes Helm`](https://github.com/kubernetes/helm) is a tool for managing packages of pre-configured
55-
Kubernetes resources, aka Kubernetes charts.
52+
[Helm](https://helm.sh/) is a tool for managing packages of pre-configured
53+
Kubernetes resources. These packages are known as _Helm charts_.
5654
-->
5755
## Helm
56+
{{% thirdparty-content single="true" %}}
5857

59-
[`Kubernetes Helm`](https://github.com/kubernetes/helm)
60-
是一个用于管理预配置 Kubernetes 资源包的工具，也就是 Kubernetes 图表。
58+
[Helm](https://helm.sh/)
59+
是一个用于管理预配置 Kubernetes 资源包的工具。这些包被称为“Helm 图表”。
6160

6261
<!--
6362
Use Helm to:
@@ -98,4 +97,46 @@ Use Kompose to:
9897

9998
* 将 Docker Compose 文件翻译成 Kubernetes 对象
10099
* 从本地 Docker 开发转到通过 Kubernetes 管理你的应用程序
101-
* 转换 Docker Compose v1 或 v2 版本的 `yaml` 文件或[分布式应用程序包](https://docs.docker.com/compose/bundles/)
100+
* 转换 Docker Compose v1 或 v2 版本的 `yaml` 文件或[分布式应用程序包](https://docs.docker.com/compose/bundles/)
101+
102+
## Kui
103+
104+
<!--
105+
[`Kui`](https://github.com/kubernetes-sigs/kui) is a GUI tool that takes your normal
106+
`kubectl` command line requests and responds with graphics.
107+
-->
108+
[`Kui`](https://github.com/kubernetes-sigs/kui)
109+
是一个接受你标准的 `kubectl` 命令行请求并以图形响应的 GUI 工具。
110+
111+
<!--
112+
Kui takes the normal `kubectl` command line requests and responds with graphics. Instead
113+
of ASCII tables, Kui provides a GUI rendering with tables that you can sort.
114+
-->
115+
Kui 接受标准的 `kubectl` 命令行工具并以图形响应。
116+
Kui 提供包含可排序表格的 GUI 渲染，而不是 ASCII 表格。
117+
118+
<!--
119+
Kui lets you:
120+
121+
* Directly click on long, auto-generated resource names instead of copying and pasting
122+
* Type in `kubectl` commands and see them execute, even sometimes faster than `kubectl` itself
123+
* Query a {{< glossary_tooltip text="Job" term_id="job">}} and see its execution rendered
124+
as a waterfall diagram
125+
* Click through resources in your cluster using a tabbed UI
126+
-->
127+
Kui 让你能够：
128+
129+
* 直接点击长的、自动生成的资源名称，而不是复制和粘贴
130+
* 输入 `kubectl` 命令并查看它们的执行，有时甚至比 `kubectl` 本身更快
131+
* 查询 {{<glossary_tooltip text="Job" term_id="job">}} 并查看其执行渲染为瀑布图
132+
* 使用选项卡式 UI 在集群中单击资源
133+
134+
## Minikube
135+
136+
<!--
137+
[`minikube`](https://minikube.sigs.k8s.io/docs/) is a tool that
138+
runs a single-node Kubernetes cluster locally on your workstation for
139+
development and testing purposes.
140+
-->
141+
[`minikube`](https://minikube.sigs.k8s.io/docs/)
142+
是一种在你的工作站上本地运行单节点 Kubernetes 集群的工具，用于开发和测试。

0 commit comments

Comments
 (0)