[CP 336] cni: Append fallback paths when resolving host-device binary#100
Merged
yuva29 merged 1 commit intoJun 23, 2026
Conversation
When CNI_PATH is set by the container runtime (e.g., Multus on OpenShift sets it to /opt/cni/bin), getCNIPath() returned only that path without including the fallback locations. On OpenShift, the host-device binary is installed by the network operator's CNI plugins DaemonSet into /var/lib/cni/bin, which is part of the fallback but was never searched when CNI_PATH was set. Append fallbackCNIPluginPath to the runtime-provided CNI_PATH so that both locations are searched. Signed-off-by: Leonardo Ochoa-Aday <lochoa@redhat.com> (cherry picked from commit 6639a74783ac4a434404a7e71bb17f33beee4948)
yuva29
approved these changes
Jun 23, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
cp of pensando/network-operator#336