ipam/multipool: Introduce specific ip family annotations for specifying ip pools #28244
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
github-actions
bot
added
the
kind/community-contribution
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
5 times, most recently
from
bfed145
to
91b8c0a
Compare
gandro
added
release-note/minor
maintainer-s-little-helper
bot
removed
dont-merge/needs-release-note-label
gandro
reviewed
Sep 25, 2023
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
2 times, most recently
from
00703b5
to
0abae38
Compare
|
Commit dd6cdc950f0f7378d61cb66d79413f14b935a81e does not match "(?m)^Signed-off-by:". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
maintainer-s-little-helper
bot
added
the
dont-merge/needs-sign-off
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
from
dd6cdc9
to
0abae38
Compare
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-sign-off
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
from
0abae38
to
86b847b
Compare
|
Thanks! I have made the changes. |
gandro
approved these changes
Sep 26, 2023
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
from
86b847b
to
cc7213b
Compare
gandro
reviewed
Sep 26, 2023
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
4 times, most recently
from
274edee
to
a5e3b6b
Compare
|
Thank you. I made the changes. Please let me know if there are any other issues. Appreciate your guidance. |
gandro
reviewed
Sep 27, 2023
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
from
a5e3b6b
to
a1d53c8
Compare
added 2 commits
September 27, 2023 20:13
This adds two annotations, "ipam.cilium.io/ipv4-pool" and "ipam.cilium.io/ipv6-pool". The former can be added to pods or namespaces to specify an IPv4 pool for workloads, while the latter corresponds to specifying an IPv6 pool for workloads. Signed-off-by: Huagong Wang <wanghuagong@kylinos.cn>
Now, it will first check if the pod has annotations ipam.cilium.io/ipv4-pool or ipam.cilium.io/ipv6-pool; if so, it will return the pool from the specific IP family. If these annotations are not present, it will check if the pod has the annotation ipam.cilium.io/ip-pool, and if found, it will return the pool as usual. If the pod doesn't have any annotations, it will then check if the namespace in which the pod resides has these annotations in the same order. If neither the pod nor the namespace has these annotations, it will return the default IP pool. Signed-off-by: Huagong Wang <wanghuagong@kylinos.cn>
hargrovee
force-pushed
the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
from
a1d53c8
to
19bd9c2
Compare
|
Thank you for your guidance and thoughtful suggestions. Much appreciated. |
|
/test |
|
@tommyp1ckles PTAL |
aanm
approved these changes
Oct 3, 2023
maintainer-s-little-helper
bot
added
the
ready-to-merge
hargrovee
deleted the
introduce-specific-IP-family-annotations-for-specifying-IP-pools
branch
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In dual-stack mode, it's necessary to allocate both IPv4 and IPv6 addresses for pods. However, custom IP pools may only focus on either IPv4 or IPv6, which can result in the custom IP pool being configured with only IPv4 or IPv6. When specifying an IP pool for a namespace or pod through annotations, this can cause pod creation to fail because the specified IP pool lacks the IPv4 or IPv6 family.
This PR introduces two IP-family specific annotations: ipam.cilium.io/ipv4-pool and ipam.cilium.io/ipv6-pool. When specifying pools for pods or namespaces, combining these annotations allows for handling more scenarios.
This PR covers the use cases mentioned here #28204 (comment) and has been implemented based on the suggestions here #28204 (review).