Fix panic error from windows agent if no cni is deployed. #6768
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
Signed-off-by: Derek Nola <[email protected]>
Signed-off-by: PoAn Yang <[email protected]>
Signed-off-by: Roberto Bonafiglia <[email protected]>
[release-1.31] Bump multus chart to v4.1.000
As discussed, it doesn't make sense anymore to keep them in the airgap tarball since we don't synchronize the sriov chart with an rke2 release.
[release 1.31] Remove sriov images from airgap tarball
Signed-off-by: Vitor Savian <[email protected]>
|
Please rebase your code off |
|
I think that you didn't rebase your branch but merge it with the master that's why your PR include different commits and also the conflicts aren't fixed rightly. I'll create an issue to track this and a PR with the fix similar to yours. |
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.
Proposed Changes
Fixed panic error if no cni is deployed from windows agent.
Types of Changes
Bugfix (Code change)
User-Facing Change
NONE