Add dual-stack support to the etcd registry #1522
Conversation
|
This is still WIP, right? |
It's good enough for my local testing; Imho what's mostly missing is some documentation in running.md on how to configure it, but code-wise it's complete. Unless there are some other bits you'd like to see? |
I wrote that because of the |
Oh sorry my bad; we have a convention to do our work in wip/xxxx branches which some git managements systems get confused about ; i'll fix the title. |
sjoerdsimons
changed the title
|
Seems good! Could you please also update the docs? Currently for dual-stack only kube-subnet-mgr appears as the correct config https://github.com/flannel-io/flannel/blob/master/Documentation/configuration.md#dual-stack |
Comparing two pointers in golang just compares the pointer addresses not the value, hence the curremt Empty() implementation always returns false. Fix that and add tests for it. Signed-off-by: Sjoerd Simons <[email protected]>
To allow a lease to contain both an ipv4 and an (optional) ipv6 address extend the subnet key parsing/generation with an optional "&<ipv6 address>-<prefix length"> So examples of the various forms become: * 10.12.13.0-24 (ipv4 only) * 10.12.13.0-24&fd00:12:13::-56 (ipv4 and ipv6) Ipv6 only is not currently supported (as flannel heavily assumes ipv4 is always enabled throughout its code-base). Though an ipv6 only key could be "&fd00:12:13::-56" Signed-off-by: Sjoerd Simons <[email protected]>
Take advantage of the etcd keys now being able to serialize an ipv4 and ipv6 address to allow dual-stack leases. ipv4 is mandatory, ipv6 is optional. The lease lookup in etcd is still done based on the external ipv4 address. Generated dual-stack addresses will use the same offset inside the address range for v4 and v6, so the coupling is deterministic. Signed-off-by: Sjoerd Simons <[email protected]>
sjoerdsimons
force-pushed
the
wip/sjoerd/localregistry
branch
from
7267f7b to
92a50ac
Compare
As a fallback, if no subnet lease can be foudn in etcd, flannel tries to fallback to the subnets in the subnet.env file. Add support for dual-stack to the fallback path Signed-off-by: Sjoerd Simons <[email protected]>
Signed-off-by: Sjoerd Simons <[email protected]>
Description
Add dual-stack support to the etcd registry
Todos
Release Note