add netavark plugin support #18002
Merged
add netavark plugin support #18002
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
openshift-ci
bot
added
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Luap99
force-pushed
the
netavark-plugin
branch
2 times, most recently
from
97e8958 to
6f10865
Compare
openshift-merge-robot
added
the
needs-rebase
openshift-merge-robot
removed
the
needs-rebase
|
Try adding this? diff --git a/libpod/storage.go b/libpod/storage.go
index dc19a5d4f..8994641fd 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -164,8 +165,8 @@ func (r *storageService) CreateContainerStorage(ctx context.Context, systemConte
logrus.Debugf("Container %q has run directory %q", container.ID, containerRunDir)
return ContainerInfo{
- UIDMap: options.UIDMap,
- GIDMap: options.GIDMap,
+ UIDMap: container.UIDMap,
+ GIDMap: container.GIDMap,
Dir: containerDir,
RunDir: containerRunDir,
Config: imageConfig, |
openshift-merge-robot
added
the
needs-rebase
openshift-merge-robot
removed
the
needs-rebase
Luap99
changed the title
openshift-ci
bot
added
release-note
and removed
do-not-merge/work-in-progress
|
LGTM from my end |
Allow users to customize the network_interface option is the network config. For bridge this allows users to change the bridge name and for maclvan it will be the same as `--opt parent=...`. However the main reason for this option is to allow netavark plugins to make use of it. I demoed the host-device plugin which makes use of this as an example. While we could let users set them via --opt it is more natural to just use the field which is designed for that purpose. Signed-off-by: Paul Holzinger <[email protected]>
- add information about netavark plugins - add missing arguments to options the require an arg - document that container dns is only supported with bridge Signed-off-by: Paul Holzinger <[email protected]>
This test was added twice once for CNI and netavark, just write it once there is no need to do this weird skip thing. Signed-off-by: Paul Holzinger <[email protected]>
DHCP should be support with netavark now, the dns tests should just work as well. Signed-off-by: Paul Holzinger <[email protected]>
|
/lgtm |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
github-actions
bot
added
the
locked - please file new issue/PR
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.
Add netavark plugins and netavark macvlan dhcp support (was already merged with c/common but this fixes tests and docs).
Does this PR introduce a user-facing change?