Skip to content

Commit

Permalink
Fix overlapping addresses
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <[email protected]>
  • Loading branch information
manuelbuil committed Nov 20, 2023
1 parent a733066 commit dc92427
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docs/installation/network-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Dual-stack networking must be configured when the cluster is first created. It c
To enable dual-stack in K3s, you must provide valid dual-stack `cluster-cidr` and `service-cidr` on all server nodes. This is an example of a valid configuration:

```
--cluster-cidr=10.42.0.0/16,2001:cafe:42:0::/56 --service-cidr=10.43.0.0/16,2001:cafe:42:1::/112
--cluster-cidr=10.42.0.0/16,2001:cafe:42::/56 --service-cidr=10.43.0.0/16,2001:cafe:43::/112
```

Note that you may configure any valid `cluster-cidr` and `service-cidr` values, but the above masks are recommended. If you change the `cluster-cidr` mask, you should also change the `node-cidr-mask-size-ipv4` and `node-cidr-mask-size-ipv6` values to match the planned pods per node and total node count. The largest supported `service-cidr` mask is /12 for IPv4, and /112 for IPv6. Remember to allow ipv6 traffic if you are deploying in a public cloud.
Expand All @@ -179,7 +179,7 @@ If your IPv6 default route is set by a router advertisement (RA), you will need
Single-stack IPv6 clusters (clusters without IPv4) are supported on K3s using the `--cluster-cidr` and `--service-cidr` flags. This is an example of a valid configuration:

```bash
--cluster-cidr=2001:cafe:42:0::/56 --service-cidr=2001:cafe:42:1::/112
--cluster-cidr=2001:cafe:42::/56 --service-cidr=2001:cafe:43::/112
```

## Distributed hybrid or multicloud cluster
Expand Down Expand Up @@ -237,7 +237,7 @@ There are four steps to be done with Tailscale before deploying K3s:
"autoApprovers": {
"routes": {
"10.42.0.0/16": ["[email protected]"],
"2001:cafe:42:0::/56": ["[email protected]"],
"2001:cafe:42::/56": ["[email protected]"],
},
},
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Dual-stack networking must be configured when the cluster is first created. It c
To enable dual-stack in K3s, you must provide valid dual-stack `cluster-cidr` and `service-cidr` on all server nodes. This is an example of a valid configuration:

```
--cluster-cidr=10.42.0.0/16,2001:cafe:42:0::/56 --service-cidr=10.43.0.0/16,2001:cafe:42:1::/112
--cluster-cidr=10.42.0.0/16,2001:cafe:42::/56 --service-cidr=10.43.0.0/16,2001:cafe:43::/112
```

Note that you may configure any valid `cluster-cidr` and `service-cidr` values, but the above masks are recommended. If you change the `cluster-cidr` mask, you should also change the `node-cidr-mask-size-ipv4` and `node-cidr-mask-size-ipv6` values to match the planned pods per node and total node count. The largest supported `service-cidr` mask is /12 for IPv4, and /112 for IPv6. Remember to allow ipv6 traffic if you are deploying in a public cloud.
Expand All @@ -159,7 +159,7 @@ If your IPv6 default route is set by a router advertisement (RA), you will need
Single-stack IPv6 clusters (clusters without IPv4) are supported on K3s using the `--cluster-cidr` and `--service-cidr` flags. This is an example of a valid configuration:

```bash
--cluster-cidr=2001:cafe:42:0::/56 --service-cidr=2001:cafe:42:1::/112
--cluster-cidr=2001:cafe:42::/56 --service-cidr=2001:cafe:43::/112
```


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Kubernetes [Issue #111695](https://github.com/kubernetes/kubernetes/issues/11169
要在 K3s 中启用双栈,你必须在所有 server 节点上提供有效的双栈 `cluster-cidr``service-cidr`。以下是一个有效配置的示例:

```
--cluster-cidr=10.42.0.0/16,2001:cafe:42:0::/56 --service-cidr=10.43.0.0/16,2001:cafe:42:1::/112
--cluster-cidr=10.42.0.0/16,2001:cafe:42::/56 --service-cidr=10.43.0.0/16,2001:cafe:43::/112
```

请注意,你可以配置任何有效的 `cluster-cidr``service-cidr` 值,但建议使用上述掩码。如果更改 `cluster-cidr` 掩码,则还应更改 `node-cidr-mask-size-ipv4``node-cidr-mask-size-ipv6` 值以匹配每个节点的计划 pod 和节点总数。对于 IPv4,支持的最大 `service-cidr` 掩码是 /12,而 IPv6 的是 /112。如果你在公共云中部署,请记住允许 ipv6 流量。
Expand All @@ -176,7 +176,7 @@ Kubernetes [Issue #111695](https://github.com/kubernetes/kubernetes/issues/11169
你可以使用 `--cluster-cidr``--service-cidr` 标志在 K3s 上使用单栈 IPv6 集群(没有 IPv4 的集群)。以下是一个有效配置的示例:

```bash
--cluster-cidr=2001:cafe:42:0::/56 --service-cidr=2001:cafe:42:1::/112
--cluster-cidr=2001:cafe:42::/56 --service-cidr=2001:cafe:43::/112
```

## 分布式混合或多云集群
Expand Down Expand Up @@ -234,7 +234,7 @@ K3s 可以与 [Tailscale](https://tailscale.com/) 集成,以便节点使用 Ta
"autoApprovers": {
"routes": {
"10.42.0.0/16": ["[email protected]"],
"2001:cafe:42:0::/56": ["[email protected]"],
"2001:cafe:42::/56": ["[email protected]"],
},
},
```
Expand Down

0 comments on commit dc92427

Please sign in to comment.