Fix default CNI paths #3697
Fix default CNI paths #3697
Conversation
|
@flouthoc This should fix the rootless issue with cni. |
|
LGTM Or better yet add a test buildah build --help | grep -- --cni-config-dir Should we hide these options, are these really options we expect users to play with? |
|
I think it would make sense to remove these options. The fields from the bud/run options structs should also be removed IMO but this would be a breaking change. I am not sure if these options are used anywhere (I hope not). |
|
Just hide the options and remove the documentation from the man pages, should be sufficient. |
We need to use the default from containers.conf and not hardcode them in buildah. This fixes an issue with the cni network backend since it would try to access /etc/cni/net.d/ even as rootless user. This regression was introduced in commit f9cff07. Also hide the cni flags as we do not expect users to change this. The recommended way is to change them in containers.conf. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, rhatdan 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 |
Following PR allows vendoring in latest buildah. Since some of the essential constants were removed from buildah hence they cannot be used any more. Use `c/common` instead. Constants were removed in following PR: containers/buildah#3697 [NO NEW TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
Following PR allows vendoring in latest buildah. Since some of the essential constants were removed from buildah hence they cannot be used any more. Use `c/common` instead. Constants were removed in following PR: containers/buildah#3697 [NO NEW TESTS NEEDED] [NO TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
What type of PR is this?
/kind bug
What this PR does / why we need it:
We need to use the default from containers.conf and not hardcode them in
buildah. This fixes an issue with the cni network backend since it would
try to access /etc/cni/net.d/ even as rootless user. This regression was
introduced in commit f9cff07.
Also hide the cni flags as we do not expect users to change this. The
recommended way is to change them in containers.conf.
How to verify it
run
buildah budrootlessWhich issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?