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

Reinstate host-local IPAM aggregation #1077

Merged

Conversation

Projects
None yet
3 participants
@caseydavenport
Copy link
Member

commented Apr 22, 2019

We removed host-local IPAM aggregation in v3.6 when we switched KDD mode
over to use Calico IPAM. However, there are some scenarios where we may
still want to use host-local IPAM with BGP.

This PR reinstates the ability to use host-local IPAM with Calico BGP,
and get proper route aggregation.

To enable it, make sure you're using the KDD backend and set USE_POD_CIDR=true.

This PR adds back support for IPIP mode but doesn't attempt to implement VXLAN support.

  • Tests
  • Documentation
  • Release note
Reinstate BGP route aggregation when using host-local IPAM via config option USE_POD_CIDR

@caseydavenport caseydavenport force-pushed the caseydavenport:reinstate-host-local branch from d49265b to 4b13073 Apr 22, 2019

},
}

// If using Calico IPAM, include IPAM resources the felix cares about.

This comment has been minimized.

Copy link
@caseydavenport

caseydavenport Apr 22, 2019

Author Member

We could alternatively implement a dummy version of IPAM blocks so that we don't need this extra plumbing. The main thing is that Felix tries to list/watch IPAM blocks and those don't exist when using host-local.

I don't have a strong preference on how we do this - @fasaxc WDYT?

@caseydavenport

This comment has been minimized.

Copy link
Member Author

commented Apr 23, 2019

Have tests locally, working on the felix syncer ones before pushing.

@fasaxc

This comment has been minimized.

Copy link
Member

commented Apr 23, 2019

Does this basically get us back to where we were before? I.e. were we polling (rather than watching) the local node before?

@caseydavenport

This comment has been minimized.

Copy link
Member Author

commented Apr 23, 2019

Does this basically get us back to where we were before? I.e. were we polling (rather than watching) the local node before?

Yeah, I hadn't spotted that, and it's a bit surprising, but that file is more-or-less copy/paste from what we had before (with a few naming changes), so I suppose we were just polling before!

Should be easy to add the Watch in though if we want it.

@fasaxc

fasaxc approved these changes Apr 23, 2019

@caseydavenport caseydavenport merged commit 43d5724 into projectcalico:master Apr 23, 2019

2 checks passed

license/cla Contributor License Agreement is signed.
Details
semaphoreci The build passed on Semaphore.
Details

@caseydavenport caseydavenport deleted the caseydavenport:reinstate-host-local branch Apr 23, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.