Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix some grammar and spelling errors #123

Merged
merged 2 commits into from
Sep 26, 2023
Merged

fix some grammar and spelling errors #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab08d2
fix some grammar and spelling errors
liruonian Sep 26, 2023
1fa7b90
fix some grammar and spelling errors
liruonian Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/guide/custom-routes.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
"gw": "10.16.0.254"
}, {
"gw": "10.16.0.254"
}]'
}]
spec:
containers:
- name: nginx
Expand Down Expand Up @@ -48,7 +48,7 @@ spec:
"gw": "10.16.0.254"
}, {
"gw": "10.16.0.254"
}]'
}]
spec:
containers:
- name: nginx
Expand Down
4 changes: 2 additions & 2 deletions docs/guide/custom-routes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
"gw": "10.16.0.254"
}, {
"gw": "10.16.0.254"
}]'
}]
spec:
containers:
- name: nginx
Expand Down Expand Up @@ -48,7 +48,7 @@ spec:
"gw": "10.16.0.254"
}, {
"gw": "10.16.0.254"
}]'
}]
spec:
containers:
- name: nginx
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/static-ip-mac.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following points need to be noted when using annotation.
## Workload IP Pool

Kube-OVN supports setting fixed IPs for Workloads (Deployment/StatefulSet/DaemonSet/Job/CronJob) via annotation `ovn.kubernetes.io/ip_pool`.
`kube-ovn-controllerr` will automatically select the IP specified in `ovn.kubernetes.io/ip_pool` and perform conflict detection.
`kube-ovn-controller` will automatically select the IP specified in `ovn.kubernetes.io/ip_pool` and perform conflict detection.

The Annotation of the IP Pool needs to be added to the `annotation` field in the `template`.
In addition to Kubernetes built-in workload types, other user-defined workloads can also be assigned fixed addresses using the same approach.
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/static-ip-mac.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
## Workload 通用 IP Pool 固定地址

Kube-OVN 支持通过 annotation `ovn.kubernetes.io/ip_pool` 给 Workload（Deployment/StatefulSet/DaemonSet/Job/CronJob）设置固定 IP。
`kube-ovn-controllerr` 会自动选择 `ovn.kubernetes.io/ip_pool` 中指定的 IP 并进行冲突检测。
`kube-ovn-controller` 会自动选择 `ovn.kubernetes.io/ip_pool` 中指定的 IP 并进行冲突检测。

IP Pool 的 Annotation 需要加在 `template` 内的 `annotation` 字段，除了 Kubernetes 内置的 Workload 类型，
其他用户自定义的 Workload 也可以使用同样的方式进行固定地址分配。
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/subnet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ spec:

## Multicast-Snoop 配置

默认情况下 subnet 下的 Pod 如果发送组播报文，OVN 的默认行为是会广播组播报文到子网下所有的 Pod。如果开启subnet 的 multicast snoop 开关，OVN 会根据 `South Database` 中的组播表 `Multicast_Group` 来进行转发，而不在进行广播。
默认情况下 subnet 下的 Pod 如果发送组播报文，OVN 的默认行为是会广播组播报文到子网下所有的 Pod。如果开启 subnet 的 multicast snoop 开关，OVN 会根据 `South Database` 中的组播表 `Multicast_Group` 来进行转发，而不在进行广播。

```yaml
apiVersion: kubeovn.io/v1
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/vpc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ spec:

### 创建浮动 IP

通过浮动 IP 规则，VPC 内的一个 IP 会和 EIP 进行完全映射，外部可以通过这个 EIP 方位 VPC 内的 IP，VPC 内的这个 IP 访问外部地址时也会 SNAT 成这个 EIP。
通过浮动 IP 规则，VPC 内的一个 IP 会和 EIP 进行完全映射，外部可以通过这个 EIP 访问 VPC 内的 IP，VPC 内的这个 IP 访问外部地址时也会 SNAT 成这个 EIP。

```yaml
---
Expand Down
Loading