Skip to content

Commit dd963fe

Browse files
authored
Merge pull request #35994 from ydFu/update-weave-net
[zh] Remove duplicate words
2 parents 232eb4f + 6e8e47e commit dd963fe

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace. These annotations apply to `Event` object from API group
1515
-->
1616
该页面作为 kubernetes.io 名字空间的审计注解的参考。这些注解适用于 API 组 `audit.k8s.io` 中的 `Event` 对象。
1717

18+
{{< note >}}
1819
<!--
1920
The following annotations are not used within the Kubernetes API. When you
2021
[enable auditing](/docs/tasks/debug/debug-cluster/audit/) in your cluster,
@@ -23,10 +24,10 @@ The annotations apply to audit events. Audit events are different from objects i
2324
[Event API](/docs/reference/kubernetes-api/cluster-resources/event-v1/) (API group
2425
`events.k8s.io`).
2526
-->
26-
{{< note >}}
2727
Kubernetes API 中不使用以下注解。当你在集群中[启用审计](/zh-cn/docs/tasks/debug/debug-cluster/audit/)时,
2828
审计事件数据将使用 API 组 `audit.k8s.io` 中的 `Event` 写入。
29-
注解适用于审计事件。审计事件不同于[事件 API ](/zh-cn/docs/reference/kubernetes-api/cluster-resources/event-v1/)
29+
注解适用于审计事件。
30+
审计事件不同于[事件 API](/zh-cn/docs/reference/kubernetes-api/cluster-resources/event-v1/)
3031
(API 组 `events.k8s.io`)中的对象。
3132
{{</note>}}
3233

@@ -135,7 +136,7 @@ See [Auditing](/docs/tasks/debug/debug-cluster/audit/) for more information.
135136

136137
有关详细信息,请参阅[审计](/zh-cn/docs/tasks/debug/debug-cluster/audit/)
137138

138-
## missing-san.invalid-cert.kubernetes.io/$hostname
139+
## missing-san.invalid-cert.kubernetes.io/$hostname {##missing-san-invalid-cert-kubernetes-io-hostname}
139140

140141
<!--
141142
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"`
@@ -170,7 +171,7 @@ There's more information about this in the Go documentation:
170171
Go 文档中有更多关于此的信息:
171172
[X.509 CommonName 弃用](https://go.dev/doc/go1.15#commonname)
172173

173-
## insecure-sha1.invalid-cert.kubernetes.io/$hostname
174+
## insecure-sha1.invalid-cert.kubernetes.io/$hostname {#insecure-sha1-invalid-cert-kubernetes-io-hostname}
174175

175176
<!--
176177
Example: `insecure-sha1.invalid-cert.kubernetes.io/example-svc.example-namespace.svc: "uses an insecure SHA-1 signature"`
@@ -187,7 +188,7 @@ is using an insecure certificate signed with a SHA-1 hash.
187188
Support for these insecure certificates is disabled by default in Kubernetes 1.24,
188189
and will be removed in a future release.
189190
-->
190-
此注解表示 webhook 或聚合 API 服务器正在使用使用 SHA-1 签名的不安全证书。
191+
此注解表示 webhook 或聚合 API 服务器所使用的是使用 SHA-1 签名的不安全证书。
191192
Kubernetes 1.24 已经默认禁用,并将在未来的版本中删除对这些证书的支持。
192193

193194
<!--

content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ weight: 50
1717
<!--
1818
This page shows how to use Weave Net for NetworkPolicy.
1919
-->
20-
本页展示如何使用使用 Weave Net 提供 NetworkPolicy。
20+
本页展示如何使用 Weave Net 提供 NetworkPolicy。
2121

2222
## {{% heading "prerequisites" %}}
2323

@@ -42,7 +42,7 @@ The Weave Net addon for Kubernetes comes with a
4242
that automatically monitors Kubernetes for any NetworkPolicy annotations on all
4343
namespaces and configures `iptables` rules to allow or block traffic as directed by the policies.
4444
-->
45-
## 安装 Weave Net 插件
45+
## 安装 Weave Net 插件 {#install-the-weave-net-addon}
4646

4747
按照[通过插件集成 Kubernetes](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/)
4848
指南执行安装。
@@ -59,17 +59,19 @@ Verify that the weave works.
5959
6060
Enter the following command:
6161
-->
62-
## 测试安装
62+
## 测试安装 {#test-the-installation}
6363

6464
验证 weave 是否有效。
6565

6666
输入以下命令:
6767

6868
```shell
69-
kubectl get po -n kube-system -o wide
69+
kubectl get pods -n kube-system -o wide
7070
```
7171

72-
<!-- The output is similar to this: -->
72+
<!--
73+
The output is similar to this:
74+
-->
7375
输出类似这样:
7476

7577
```
@@ -83,18 +85,20 @@ weave-net-pmw8w 2/2 Running 0 9d
8385
<!--
8486
Each Node has a weave Pod, and all Pods are `Running` and `2/2 READY`. (`2/2` means that each Pod has `weave` and `weave-npc`.)
8587
-->
86-
每个 Node 都有一个 weave Pod,所有 Pod 都是`Running``2/2 READY`
87-
`2/2` 表示每个 Pod 都有 `weave``weave-npc`
88+
每个 Node 都有一个 weave Pod,所有 Pod 都是 `Running``2/2 READY`
89+
`2/2` 表示每个 Pod 都有 `weave``weave-npc`
8890

8991
## {{% heading "whatsnext" %}}
9092

9193
<!--
92-
Once you have installed the Weave Net addon, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy. If you have any question, contact us at [#weave-community on Slack or Weave User Group](https://github.com/weaveworks/weave#getting-help).
94+
Once you have installed the Weave Net addon, you can follow the
95+
[Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/)
96+
to try out Kubernetes NetworkPolicy. If you have any question, contact us at
97+
[#weave-community on Slack or Weave User Group](https://github.com/weaveworks/weave#getting-help).
9398
-->
9499
安装 Weave Net 插件后,你可以参考
95100
[声明网络策略](/zh-cn/docs/tasks/administer-cluster/declare-network-policy/)
96101
来试用 Kubernetes NetworkPolicy。
97102
如果你有任何疑问,请通过
98103
[Slack 上的 #weave-community 频道或者 Weave 用户组](https://github.com/weaveworks/weave#getting-help)
99104
联系我们。
100-

0 commit comments

Comments
 (0)