Skip to content
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.

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

dual-stack support for l3-gateway-config annotation #1239

Merged
merged 4 commits into from
Apr 14, 2020

Conversation

danwinship
Copy link
Contributor

This adds dual-stack support to the setting and parsing of the l3-gateway-config annotation (but not rippling much beyond that).

Similarly to the pod annotation, I've added new array-valued ip-addresses and next-hops to replace ip-address and next-hop, and we set both fields in single-stack clusters but only the new fields in dual-stack clusters; eventually we can migrate to only setting the new fields everywhere.

node_annotations.go gets mostly rewritten but the new unit test shows that it's a no-op except where expected.

This also updates one of our external-ids in ovn similarly.

@dcbw

@danwinship danwinship closed this Apr 9, 2020
@danwinship danwinship reopened this Apr 9, 2020
@danwinship danwinship mentioned this pull request Apr 9, 2020
37 tasks
@dcbw
Copy link
Contributor

dcbw commented Apr 10, 2020

@danwinship needs rebase due to other merges.

@danwinship danwinship force-pushed the dual-stack-gateway branch 2 times, most recently from 9ae5840 to 8317cf2 Compare April 10, 2020 21:16
Signed-off-by: Dan Winship <danw@redhat.com>
Also make the caller set the chassis ID explicitly (like it was
originally), for consistency on set vs get.

Signed-off-by: Dan Winship <danw@redhat.com>
@dcbw
Copy link
Contributor

dcbw commented Apr 13, 2020

 ~/work/ovn-kubernetes/ovn-kubernetes/go-controller ~/work/ovn-kubernetes/ovn-kubernetes
!!! 'gofmt -s' needs to be run on the following files: 
./pkg/util/node_annotations_test.go

Signed-off-by: Dan Winship <danw@redhat.com>
@danwinship
Copy link
Contributor Author

@dcbw this one is green now

@dcbw
Copy link
Contributor

dcbw commented Apr 14, 2020

/lgtm

@dcbw dcbw merged commit fdcb415 into ovn-kubernetes:master Apr 14, 2020
@danwinship danwinship deleted the dual-stack-gateway branch April 14, 2020 12:27
kyrtapz pushed a commit to kyrtapz/ovn-kubernetes that referenced this pull request Jan 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants