From 0706ae2e66a40032983439a150e9ec6636c9f15c Mon Sep 17 00:00:00 2001 From: Luigi600 Date: Tue, 28 Nov 2023 08:30:50 +0100 Subject: [PATCH 1/2] Fix installation network-options table Signed-off-by: Luigi600 --- docs/installation/network-options.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/installation/network-options.md b/docs/installation/network-options.md index d85683d42..1a1fd4e9f 100644 --- a/docs/installation/network-options.md +++ b/docs/installation/network-options.md @@ -19,15 +19,15 @@ This page describes K3s network configuration options, including configuration o You must ensure that WireGuard kernel modules are available on every node, both servers and agents, before attempting to use the WireGuard Flannel backend. - CLI Flag and Value | Description - -------------------|------------ - `--flannel-ipv6-masq` | Apply masquerading rules to IPv6 traffic (default for IPv4). Only applies on dual-stack or IPv6-only clusters. Compatible with any Flannel backend other than `none`. | - `--flannel-external-ip` | Use node external IP addresses as the destination for Flannel traffic, instead of internal IPs. Only applies when --node-external-ip is set on a node. | - `--flannel-backend=vxlan` | Use VXLAN to encapsulate the packets. May require additional kernel modules on Raspberry Pi. | - `--flannel-backend=host-gw` | Use IP routes to pod subnets via node IPs. Requires direct layer 2 connectivity between all nodes in the cluster. | - `--flannel-backend=wireguard-native` | Use WireGuard to encapsulate and encrypt network traffic. May require additional kernel modules. | - `--flannel-backend=ipsec` | Use strongSwan IPSec via the `swanctl` binary to encrypt network traffic. (Deprecated; will be removed in v1.27.0) | - `--flannel-backend=none` | Disable Flannel entirely. | +| CLI Flag and Value | Description | +|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `--flannel-ipv6-masq` | Apply masquerading rules to IPv6 traffic (default for IPv4). Only applies on dual-stack or IPv6-only clusters. Compatible with any Flannel backend other than `none`. | +| `--flannel-external-ip` | Use node external IP addresses as the destination for Flannel traffic, instead of internal IPs. Only applies when --node-external-ip is set on a node. | +| `--flannel-backend=vxlan` | Use VXLAN to encapsulate the packets. May require additional kernel modules on Raspberry Pi. | +| `--flannel-backend=host-gw` | Use IP routes to pod subnets via node IPs. Requires direct layer 2 connectivity between all nodes in the cluster. | +| `--flannel-backend=wireguard-native` | Use WireGuard to encapsulate and encrypt network traffic. May require additional kernel modules. | +| `--flannel-backend=ipsec` | Use strongSwan IPSec via the `swanctl` binary to encrypt network traffic. (Deprecated; will be removed in v1.27.0) | +| `--flannel-backend=none` | Disable Flannel entirely. | :::info Version Gate From 1a7e465a7e4b1aac2920dc1984c5a9c8c6979dd0 Mon Sep 17 00:00:00 2001 From: Luigi600 Date: Mon, 4 Dec 2023 08:51:01 +0100 Subject: [PATCH 2/2] Revert formatting of the network-options table (#209, 0706ae2) Signed-off-by: Luigi600 --- docs/installation/network-options.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/installation/network-options.md b/docs/installation/network-options.md index 1a1fd4e9f..3794e46dc 100644 --- a/docs/installation/network-options.md +++ b/docs/installation/network-options.md @@ -19,15 +19,15 @@ This page describes K3s network configuration options, including configuration o You must ensure that WireGuard kernel modules are available on every node, both servers and agents, before attempting to use the WireGuard Flannel backend. -| CLI Flag and Value | Description | -|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `--flannel-ipv6-masq` | Apply masquerading rules to IPv6 traffic (default for IPv4). Only applies on dual-stack or IPv6-only clusters. Compatible with any Flannel backend other than `none`. | -| `--flannel-external-ip` | Use node external IP addresses as the destination for Flannel traffic, instead of internal IPs. Only applies when --node-external-ip is set on a node. | -| `--flannel-backend=vxlan` | Use VXLAN to encapsulate the packets. May require additional kernel modules on Raspberry Pi. | -| `--flannel-backend=host-gw` | Use IP routes to pod subnets via node IPs. Requires direct layer 2 connectivity between all nodes in the cluster. | -| `--flannel-backend=wireguard-native` | Use WireGuard to encapsulate and encrypt network traffic. May require additional kernel modules. | -| `--flannel-backend=ipsec` | Use strongSwan IPSec via the `swanctl` binary to encrypt network traffic. (Deprecated; will be removed in v1.27.0) | -| `--flannel-backend=none` | Disable Flannel entirely. | +| CLI Flag and Value | Description | +|--------------------|-------------| +| `--flannel-ipv6-masq` | Apply masquerading rules to IPv6 traffic (default for IPv4). Only applies on dual-stack or IPv6-only clusters. Compatible with any Flannel backend other than `none`. | +| `--flannel-external-ip` | Use node external IP addresses as the destination for Flannel traffic, instead of internal IPs. Only applies when --node-external-ip is set on a node. | +| `--flannel-backend=vxlan` | Use VXLAN to encapsulate the packets. May require additional kernel modules on Raspberry Pi. | +| `--flannel-backend=host-gw` | Use IP routes to pod subnets via node IPs. Requires direct layer 2 connectivity between all nodes in the cluster. | +| `--flannel-backend=wireguard-native` | Use WireGuard to encapsulate and encrypt network traffic. May require additional kernel modules. | +| `--flannel-backend=ipsec` | Use strongSwan IPSec via the `swanctl` binary to encrypt network traffic. (Deprecated; will be removed in v1.27.0) | +| `--flannel-backend=none` | Disable Flannel entirely. | :::info Version Gate