Support secondary network without IPAM #5762
Merged
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
jianjuns
added
the
area/secondary-network
antoninbas
previously approved these changes
Dec 1, 2023
Comment on lines
+236
to
+240
| if len(podCNIInfo.Interfaces) == 0 { | ||
| // Return error to requeue and retry. | ||
| return err | ||
| } | ||
| // We do not return error to retry, if at least one secondary network is configured. |
There was a problem hiding this comment.
do you remember why we have this special case?
There was a problem hiding this comment.
I think just that Arun wants to simplify the logic. We can fix in future (but I do feel there is complexity to fix partial failure or support network list update).
| @@ -70,6 +70,14 @@ const ( | |||
| } | |||
| }` | |||
|
|
|||
| netAttachTemplateNoIPAM = `{ | |||
There was a problem hiding this comment.
nit: s/netAttachTemplateNoIPAM/netAttachNoIPAMTemplate
When the secondary network configuration in NetworkAttachmentDefinition does not include IPAM configuration, simply do not allocate and configure IP addresses for the secondary interfaces. Signed-off-by: Jianjun Shen <shenj@vmware.com>
antoninbas
approved these changes
Dec 1, 2023
|
/test-all |
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.
When the secondary network configuration in NetworkAttachmentDefinition does not include IPAM configuration, simply do not allocate and configure IP addresses for the secondary interfaces.
Closes: #5693