Fix parsing CNI .conf and .json config formats #23629
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
martisah
approved these changes
Jul 18, 2024
gulducat
added
backport/ent/1.6.x+ent
tgross
approved these changes
Jul 18, 2024
so we can support more than just .conflist format like our docs claim we do
gulducat
force-pushed
the
fix-cni-config-formats
branch
from
b8dda83 to
f148e2b
Compare
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Our documentation states that we support
.confand.jsonconfig formats (which are the same, actually), but in reality only.conflistworks properly. All of them are fingerprinted correctly, but only conflist works at allocation run time.Fixes #19816
The first commit is here for a reference, which used a boolean to keep track of whether or not
confIsList, but in my second pass I made a little struct to make it easier (I think) to hold correctly.I have some e2e tests set up for this too, but I'll do that in a separate PR since we generally don't backport those.