Skip to content

Ipv6 daemon support #4853

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

Open
JoseVillalta wants to merge 8 commits into
base: master
Choose a base branch
from
+5,001 −103
Open

Ipv6 daemon support #4853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5e22f3
run-integ-tests.ps1: add windows2025 to the ValidateSet
singholt Jan 8, 2026
735c676
Merge pull request #4841 from prateekchaudhry/v1.101.2-stage
prateekchaudhry Jan 12, 2026
1b189ba
adds sysctl ipForwading key for ipv6 for Managed Daemons
Jan 16, 2026
bd5b0ad
use ip6tables in NAT for IPv6
Jan 16, 2026
2bf5aff
feat(netlib): Add IPv6 support for daemon bridge namespace configuration
Jan 21, 2026
d38c7cd
feat(netlib): Add IPv6 subnet support for daemon-bridge and E2E tests
Jan 23, 2026
a98e9cd
updates CNI version
Jan 29, 2026
e381883
Update Go modules and vendor directories to match workflow requirements
Jan 29, 2026
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 agent/ecscni/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

const (
// ECSCNIVersion, ECSCNIGitHash, VPCCNIGitHash needs to be updated every time CNI plugin is updated.
currentECSCNIVersion = "2024.09.0"
currentECSCNIGitHash = "7b4ec6016ab221469fa3abfc00ea7c05f236c26c"
currentECSCNIVersion = "2026.01.0"
currentECSCNIGitHash = "3302076781563428b69e0856b8fdd59b2ac0658f"
currentVPCCNIGitHash = "a4e9ac076709c882a904afabc4c24c7700600f6b"
)

Expand Down
2 changes: 1 addition & 1 deletion amazon-ecs-cni-plugins
Open in desktop
Submodule amazon-ecs-cni-plugins updated 17 files
+1 −1 VERSION
+51 −1 plugins/ecs-bridge/README.md
+4 −2 plugins/ecs-bridge/commands/commands.go
+204 −1 plugins/ecs-bridge/commands/commands_test.go
+1,963 −119 plugins/ecs-bridge/e2eTests/e2e_test.go
+51 −18 plugins/ecs-bridge/engine/configureveth.go
+12 −3 plugins/ecs-bridge/engine/deletelink.go
+60 −41 plugins/ecs-bridge/engine/engine.go
+2,972 −39 plugins/ecs-bridge/engine/engine_test.go
+72 −7 plugins/ipam/README.md
+236 −52 plugins/ipam/commands/commands.go
+658 −5 plugins/ipam/commands/commands_test.go
+149 −28 plugins/ipam/config/config.go
+675 −0 plugins/ipam/config/config_test.go
+322 −26 plugins/ipam/ipstore/ipstore.go
+558 −0 plugins/ipam/ipstore/ipstore_test.go
+31 −3 plugins/ipam/ipstore/mocks/ipstore_mocks.go
2 changes: 1 addition & 1 deletion ecs-agent/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ require (
github.com/prometheus/common v0.26.0
github.com/stretchr/testify v1.8.4
github.com/vishvananda/netlink v1.2.1-beta.2
github.com/vishvananda/netns v0.0.4
go.etcd.io/bbolt v1.3.9
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
golang.org/x/net v0.38.0
Expand Down Expand Up @@ -72,7 +73,6 @@ require (
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.12.0 // indirect
Expand Down
17 changes: 15 additions & 2 deletions ecs-agent/netlib/model/ecscni/ipam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
// IPAMConfig defines the configuration required for ipam plugin
type IPAMConfig struct {
CNIConfig
// IPv4 fields
// IPV4Subnet is the ip address range managed by ipam
IPV4Subnet string `json:"ipv4-subnet,omitempty"`
// IPV4Address is the ip address to deal with(assign or release) in ipam
Expand All @@ -30,13 +31,25 @@ type IPAMConfig struct {
IPV4Gateway string `json:"ipv4-gateway,omitempty"`
// IPV4Routes is the route to added in the container namespace
IPV4Routes []*types.Route `json:"ipv4-routes,omitempty"`

// IPv6 fields
// IPV6Subnet is the IPv6 address range managed by ipam
IPV6Subnet string `json:"ipv6-subnet,omitempty"`
// IPV6Address is the IPv6 address to deal with(assign or release) in ipam
IPV6Address string `json:"ipv6-address,omitempty"`
// IPV6Gateway is the IPv6 gateway returned by ipam
IPV6Gateway string `json:"ipv6-gateway,omitempty"`
// IPV6Routes is the IPv6 route to added in the container namespace
IPV6Routes []*types.Route `json:"ipv6-routes,omitempty"`

// ID is the key stored with the assigned ip in ipam
ID string `json:"id"`
}

func (ic *IPAMConfig) String() string {
return fmt.Sprintf("%s, subnet: %s, ip: %s, gw: %s, route: %s",
ic.CNIConfig.String(), ic.IPV4Subnet, ic.IPV4Address, ic.IPV4Gateway, ic.IPV4Routes)
return fmt.Sprintf("%s, ipv4-subnet: %s, ipv4-address: %s, ipv4-gateway: %s, ipv4-routes: %s, ipv6-subnet: %s, ipv6-address: %s, ipv6-gateway: %s, ipv6-routes: %s",
ic.CNIConfig.String(), ic.IPV4Subnet, ic.IPV4Address, ic.IPV4Gateway, ic.IPV4Routes,
ic.IPV6Subnet, ic.IPV6Address, ic.IPV6Gateway, ic.IPV6Routes)
}

func (ic *IPAMConfig) InterfaceName() string {
Expand Down
Loading
Loading