Add nil checks and debug logs for CNI client #4306
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
xxx0624
reviewed
Aug 23, 2024
| @@ -48,9 +50,10 @@ func NewCNIClient(paths []string) CNI { | |||
| func (c *cniClient) Add(ctx context.Context, config PluginConfig) (types.Result, error) { | |||
| rt := BuildRuntimeConfig(config) | |||
| net, err := BuildNetworkConfig(config) | |||
| if err != nil { | |||
| if err != nil || net == nil || net.Network == nil { | |||
There was a problem hiding this comment.
If the net is nil, will the err be nil or something else?
There was a problem hiding this comment.
Thanks, err would be nil, so that's not helpful at all. I'll update this.
ohsoo
changed the title
alexcmms
approved these changes
Aug 23, 2024
timj-hh
approved these changes
Aug 23, 2024
xxx0624
approved these changes
Aug 26, 2024
timj-hh
approved these changes
Aug 26, 2024
JoseVillalta
approved these changes
Aug 26, 2024
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.
Summary
Make additional nil checks after creating the network configuration to protect against panics due to the nested struct. Also add a debug log for operators.
Implementation details
Add 2 new separate nil checks and corresponding debug lines.
Testing
make test
New tests cover the changes: No new tests.
Description for the changelog
Add nil checks and debug logs for CNI client
Additional Information
Does this PR include breaking model changes? If so, Have you added transformation functions?
No
Does this PR include the addition of new environment variables in the README?
No
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.