Skip to content

Support IPsec with IPv6 underlay in IPv6-only clusters #39497

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

Merged
pchaigno merged 2 commits into from
May 21, 2025
Merged

Support IPsec with IPv6 underlay in IPv6-only clusters #39497

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
c00a770
daemon: Enable IPsec + IPv6 underlay
pchaigno May 12, 2025
c9698e3
workflows/ipsec: Cover IPv6 underlays
pchaigno May 12, 2025
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
15 changes: 15 additions & 0 deletions .github/actions/e2e/ipsec_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@
kube-proxy: 'iptables'
kpr: 'false'
tunnel: 'vxlan'
ipv4: 'false'
underlay: 'ipv6'
encryption: 'ipsec'
key-one: 'gcm(aes)'
key-two: 'gcm(aes)'
skip-upgrade: 'true'
- name: 'ipsec-8'
# renovate: datasource=docker depName=quay.io/lvh-images/kind
kernel: '6.12-20250519.045948'
Expand All @@ -79,3 +82,15 @@
encryption: 'ipsec'
key-one: 'gcm(aes)'
key-two: 'gcm(aes)'
- name: 'ipsec-9'
# renovate: datasource=docker depName=quay.io/lvh-images/kind
kernel: '6.12-20250507.063028'
kube-proxy: 'none'
kpr: 'true'
tunnel: 'vxlan'
ipv4: 'false'
underlay: 'ipv6'
encryption: 'ipsec'
key-one: 'gcm(aes)'
key-two: 'gcm(aes)'
skip-upgrade: 'true'
1 change: 1 addition & 0 deletions .github/workflows/conformance-ipsec-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ jobs:
endpoint-routes: ${{ matrix.endpoint-routes }}
ipv4: ${{ matrix.ipv4 }}
ipv6: ${{ matrix.ipv6 }}
underlay: ${{ matrix.underlay }}
kpr: ${{ matrix.kpr }}
lb-mode: ${{ matrix.lb-mode }}
lb-acceleration: ${{ matrix.lb-acceleration }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests-ipsec-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ jobs:
endpoint-routes: ${{ matrix.endpoint-routes }}
ipv4: ${{ matrix.ipv4 }}
ipv6: ${{ matrix.ipv6 }}
underlay: ${{ matrix.underlay }}
kpr: ${{ matrix.kpr }}
lb-mode: ${{ matrix.lb-mode }}
lb-acceleration: ${{ matrix.lb-acceleration }}
Expand All @@ -236,6 +237,7 @@ jobs:
endpoint-routes: ${{ matrix.endpoint-routes }}
ipv4: ${{ matrix.ipv4 }}
ipv6: ${{ matrix.ipv6 }}
underlay: ${{ matrix.underlay }}
kpr: ${{ matrix.kpr }}
lb-mode: ${{ matrix.lb-mode }}
lb-acceleration: ${{ matrix.lb-acceleration }}
Expand Down
4 changes: 2 additions & 2 deletions daemon/cmd/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ func newDaemon(ctx context.Context, cleaner *daemonCleanup, params *daemonParams
}

if option.Config.TunnelingEnabled() && params.TunnelConfig.UnderlayProtocol() == tunnel.IPv6 {
if option.Config.EnableIPSec || option.Config.EnableWireguard {
return nil, nil, fmt.Errorf("Transparent encryption (both IPsec and WireGuard) requires an IPv4 underlay")
if option.Config.EnableWireguard {
return nil, nil, fmt.Errorf("WireGuard requires an IPv4 underlay")
}
}

Expand Down
4 changes: 0 additions & 4 deletions daemon/cmd/daemon_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,10 +1251,6 @@ func initEnv(logger *slog.Logger, vp *viper.Viper) {
}
}

if option.Config.EnableIPSec && !option.Config.EnableIPv4 {
logging.Fatal(logger, "IPSec requires IPv4 addressing to be enabled (--enable-ipv4=\"true\")")
}

if option.Config.EnableIPSec && option.Config.TunnelingEnabled() {
if err := ipsec.ProbeXfrmStateOutputMask(); err != nil {
logging.Fatal(logger, "IPSec with tunneling requires support for xfrm state output masks (Linux 4.19 or later).", logfields.Error, err)
Expand Down
Loading