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.

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

Jump to bottom

Multiple ips #95

Merged
merged 3 commits into from Oct 26, 2020
Merged

Multiple ips #95

merged 3 commits into from Oct 26, 2020

Conversation

chenchun
Copy link
Contributor

No description provided.

@chenchun chenchun force-pushed the multiple-ips branch 6 times, most recently from 59aa6f9 to fcb7103 Compare October 22, 2020 04:17
@chenchun
Copy link
Contributor Author

Will send a docs update in a following PR.

Usage

Add a annotation k8s.v1.cni.galaxy.io/args: '{"request_ip_range":[["10.0.0.200~10.0.0.238"],["10.0.0.2~10.0.0.30"],["10.0.0.60~10.0.0.80"]]}' to pod spec.
galaxy-ipam allocates 3 ips, one in ["10.0.0.200~10.0.0.238"], one in ["10.0.0.2~10.0.0.30"], one in ["10.0.0.60~10.0.0.80"] and write it back to the same annotation k8s.v1.cni.galaxy.io/args: '{"request_ip_range":[["10.0.0.200~10.0.0.238"],["10.0.0.2~10.0.0.30"],["10.0.0.60~10.0.0.80"]],"common":{"ipinfos":[{"ip":"10.0.0.200/24","vlan":0,"gateway":"10.0.0.1"},{"ip":"10.0.0.2/24","vlan":0,"gateway":"10.0.0.1"},{"ip":"10.0.0.60/24","vlan":0,"gateway":"10.0.0.1"}]}}'

@chenchun
Copy link
Contributor Author

Fixes #61

@chenchun chenchun added this to the v1.0.7 milestone Oct 22, 2020
@chenchun
Add tests for RequestIPRange
adaf109 
- Fix if there are both unallocated and allocated ips in request ip ranges
- Improve NodeSubnetsByIPRanges by caching pool in FloatingIP
- fix updating workload from requesting multiple ips to only one ip wrongly allocates multiple ips
- fix resync all pod ips
- fix reserveIP
@ChenLingPeng ChenLingPeng merged commit a83419a into tkestack:master Oct 26, 2020
@chenchun chenchun deleted the multiple-ips branch December 3, 2020 10:37
@chenchun chenchun mentioned this pull request Dec 14, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChenLingPeng ChenLingPeng ChenLingPeng left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.0.7
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@chenchun @ChenLingPeng