Skip to content

[RFC0038] External Networker IPv6 support #343

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
merged 1 commit into from
Aug 8, 2025
Merged

[RFC0038] External Networker IPv6 support #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/code.cloudfoundry.org/garden-external-networker/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type UpInputs struct {
type UpOutputs struct {
Properties struct {
ContainerIP string `json:"garden.network.container-ip"`
ContainerIPv6 string `json:"garden.network.container-ipv6,omitempty"`
DeprecatedHostIP string `json:"garden.network.host-ip"`
MappedPorts string `json:"garden.network.mapped-ports"`
Interface string `json:"garden.network.interface,omitempty"`
Expand Down Expand Up @@ -124,11 +125,12 @@ func (m *Manager) Up(containerHandle string, inputs UpInputs) (*UpOutputs, error

assertedResult := result040.(*types040.Result)

var containerIP *types040.IPConfig
var containerIP, containerIPv6 *types040.IPConfig
for _, ip := range assertedResult.IPs {
if ip.Version == "4" {
containerIP = ip
break
} else if ip.Version == "6" {
containerIPv6 = ip
}
}

Expand All @@ -152,6 +154,11 @@ func (m *Manager) Up(containerHandle string, inputs UpInputs) (*UpOutputs, error
outputs.Properties.DeprecatedHostIP = "255.255.255.255"
outputs.DNSServers = assertedResult.DNS.Nameservers
outputs.SearchDomains = m.SearchDomains

if containerIPv6 != nil {
outputs.Properties.ContainerIPv6 = containerIPv6.Address.IP.String()
}

return &outputs, nil
}

Expand Down
19 changes: 19 additions & 0 deletions src/code.cloudfoundry.org/garden-external-networker/manager/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,25 @@ var _ = Describe("Manager", func() {
Expect(err).To(MatchError("proxy redirect apply: bang"))
})
})

Context("when there is an IPv6 address in the CNI result", func() {
BeforeEach(func() {
cniUpResult.IPs = append(cniUpResult.IPs, &types040.IPConfig{
Version: "6",
Address: net.IPNet{
IP: net.ParseIP("2001:db8::68"),
Mask: net.CIDRMask(64, 128),
},
})
})

It("should return the IPv6 address in the CNI result as a property", func() {
out, err := mgr.Up(containerHandle, upInputs)
Expect(err).NotTo(HaveOccurred())

Expect(out.Properties.ContainerIPv6).To(Equal("2001:db8::68"))
})
})
})

Describe("Down", func() {
Expand Down