From dc92427f6281c8668302d83d2e77a52168cedb5d Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 20 Nov 2023 08:34:02 +0100 Subject: [PATCH] Fix overlapping addresses Signed-off-by: Manuel Buil --- docs/installation/network-options.md | 6 +++--- .../current/installation/network-options.md | 4 ++-- .../current/installation/network-options.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/installation/network-options.md b/docs/installation/network-options.md index 92a024e29..0b75a5b6b 100644 --- a/docs/installation/network-options.md +++ b/docs/installation/network-options.md @@ -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. @@ -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 @@ -237,7 +237,7 @@ There are four steps to be done with Tailscale before deploying K3s: "autoApprovers": { "routes": { "10.42.0.0/16": ["your_account@xyz.com"], - "2001:cafe:42:0::/56": ["your_account@xyz.com"], + "2001:cafe:42::/56": ["your_account@xyz.com"], }, }, ``` diff --git a/i18n/kr/docusaurus-plugin-content-docs/current/installation/network-options.md b/i18n/kr/docusaurus-plugin-content-docs/current/installation/network-options.md index 5a9279e97..9c9886b34 100644 --- a/i18n/kr/docusaurus-plugin-content-docs/current/installation/network-options.md +++ b/i18n/kr/docusaurus-plugin-content-docs/current/installation/network-options.md @@ -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. @@ -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 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/installation/network-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/installation/network-options.md index 8fc0bb8ab..4f3fd5072 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/installation/network-options.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/installation/network-options.md @@ -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 流量。 @@ -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 ``` ## 分布式混合或多云集群 @@ -234,7 +234,7 @@ K3s 可以与 [Tailscale](https://tailscale.com/) 集成，以便节点使用 Ta "autoApprovers": { "routes": { "10.42.0.0/16": ["your_account@xyz.com"], - "2001:cafe:42:0::/56": ["your_account@xyz.com"], + "2001:cafe:42::/56": ["your_account@xyz.com"], }, }, ```