Podman6: remove CNI by lsm5 · Pull Request #6453 · containers/buildah

lsm5 · 2025-10-26T16:23:11Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Removes CNI for podman6

How to verify it

check if any CNI stuff still exists

Which issue(s) this PR fixes:

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

CNI support has been removed.

openshift-ci · 2025-10-26T16:23:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [lsm5]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

packit-as-a-service · 2025-10-26T16:25:51Z

Ephemeral COPR build failed. @containers/packit-build please check.

packit-as-a-service · 2025-10-26T16:25:51Z

Ephemeral COPR build failed. @containers/packit-build please check.

github-actions · 2025-11-26T00:15:25Z

A friendly reminder that this PR had no activity for 30 days.

nalind

Please avoid breaking the public API when possible.

nalind · 2026-03-11T20:15:52Z

define/build.go

-	CNIPluginPath string
-	// CNIConfigDir is the location of CNI configuration files, if the files in
-	// the default configuration directory shouldn't be used.
-	CNIConfigDir string


This is an API break. I'd prefer if these fields were marked as deprecated, like BuildOutput.

nalind · 2026-03-11T20:16:56Z

pkg/cli/common.go

+	IPC     string
+	Network string
+	PID     string
+	UTS     string


This is an API break.

nalind · 2026-03-11T20:19:35Z

buildah.go

-	CNIPluginPath string
-	// CNIConfigDir is the location of CNI configuration files, if the files in
-	// the default configuration directory shouldn't be used.
-	CNIConfigDir string


This is an API break. I'd prefer if the godoc for these fields noted that they are deprecated and are expected to be empty, possibly with a tag indicating that they won't be saved when encoded as JSON.

nalind · 2026-03-11T20:19:44Z

buildah.go

 	Capabilities          []string
 	ConfigureNetwork      string
-	CNIPluginPath         string
-	CNIConfigDir          string


This is an API break. I'd prefer if the godoc for these fields noted that they are deprecated and are expected to be empty.

nalind · 2026-03-11T20:22:20Z

buildah.go

-	CNIPluginPath string
-	// CNIConfigDir is the location of CNI configuration files, if the files in
-	// the default configuration directory shouldn't be used.
-	CNIConfigDir string


This is an API break. I'd prefer if these fields were marked as deprecated, like the define package's BuildOptions.BuildOutput.

nalind · 2026-03-11T20:25:09Z

run.go

-	CNIPluginPath string
-	// CNIConfigDir is the location of CNI configuration files, if the files in
-	// the default configuration directory shouldn't be used.
-	CNIConfigDir string


This is an API break. I'd prefer if these fields were marked as deprecated, like the define package's BuildOptions.BuildOutput.

lsm5 · 2026-03-12T10:31:27Z

@nalind good for another look. The testing-farm job failures are a Fedora infra issue, already notified them.

lsm5 · 2026-03-12T13:03:38Z

This will stay in draft until containers/container-libs#412 is merged.

nalind · 2026-03-12T13:19:39Z

imagebuildah/executor.go

-	cniPluginPath                  string
-	cniConfigDir                   string
-	// NetworkInterface is the libnetwork network interface used to setup CNI or netavark networks.
+	// networkInterface is the libnetwork network interface used to setup netavark networks.


Luap99

LGTM overall minus the one extra file

internal/mkcw/embed/entrypoint_amd64.gz

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Buildah no longer uses CNI for networking, so remove CNI spec version and libcni version from the version command output, build-time linker flags, and RPM spec. Also drop the FreeBSD CNI build tag from the Makefile since netavark is now the only supported network backend. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Mark CNIPluginPath and CNIConfigDir fields as deprecated in Builder, BuilderInfo, BuilderOptions, RunOptions, and BuildOptions structs. The fields are retained to avoid breaking the public API but are no longer used and are expected to be empty. Remove --cni-config-dir and --cni-plugin-path CLI flags. Simplify getNetworkInterface() to no longer accept CNI-specific parameters since netavark is now the only supported network backend. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Remove the docs/cni-examples/ directory, CNI installation section from install.md, and CNI fields from version man page. Remove the "from cni config test" from tests/from.bats and clean up --cni-config-dir usage from tests/namespaces.bats. Update comments that referenced CNI to use generic network terminology. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Remove the github.com/containernetworking/cni module from go.mod, go.sum, and vendor since it is no longer used. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Luap99

LGTM

One more thing I found in the CI test scrip we have an rm -rf on the cni dir which can be dropped as well

buildah/contrib/cirrus/test.sh

Lines 11 to 14 in 09917c4

    
           # Remove /var/lib/cni, it is not required for rootless cni. 
        
           # We have to test that it works without this directory. 
        
           # https://github.com/containers/podman/issues/10857 
        
           rm -rf /var/lib/cni

Anyhow non blocking, tests look good here and this can be fixed easily later so I think it is better to merge now to continue the dance into podman

lsm5 added the podman 6 breaking changes that should only go into podman 6 label Oct 26, 2025

openshift-ci bot added the do-not-merge/work-in-progress label Oct 26, 2025

openshift-ci bot added the approved label Oct 26, 2025

lsm5 force-pushed the podman6-no-cni branch 4 times, most recently from 32e105a to 79be198 Compare October 26, 2025 18:57

github-actions bot added the stale-pr label Nov 26, 2025

lsm5 force-pushed the podman6-no-cni branch 3 times, most recently from 3e0adc8 to dcab45a Compare March 5, 2026 13:18

lsm5 mentioned this pull request Mar 5, 2026

Podman6: Vendor update w/o CNI + additional cleanups containers/podman#28202

Draft

6 tasks

lsm5 force-pushed the podman6-no-cni branch from dcab45a to 54d8f5a Compare March 5, 2026 15:58

lsm5 mentioned this pull request Mar 9, 2026

Remove CNI for podman6 containers/container-libs#412

Merged

nalind requested changes Mar 11, 2026

View reviewed changes

lsm5 force-pushed the podman6-no-cni branch from 54d8f5a to 60b918b Compare March 12, 2026 09:29

lsm5 changed the title ~~[WIP] Podman6: remove CNI~~ Podman6: remove CNI Mar 12, 2026

lsm5 force-pushed the podman6-no-cni branch from 60b918b to 08265dd Compare March 12, 2026 09:32

lsm5 force-pushed the podman6-no-cni branch from 08265dd to 0cb909a Compare March 12, 2026 11:32

lsm5 removed the stale-pr label Mar 12, 2026

nalind reviewed Mar 12, 2026

View reviewed changes

Luap99 reviewed Mar 12, 2026

View reviewed changes

internal/mkcw/embed/entrypoint_amd64.gz Show resolved Hide resolved

lsm5 force-pushed the podman6-no-cni branch 2 times, most recently from 0ba7a4b to e00419f Compare March 13, 2026 13:41

Luap99 mentioned this pull request Mar 16, 2026

storage: port storage.conf to new configfile package and rework option parsing containers/container-libs#680

Open

lsm5 added 5 commits March 17, 2026 14:14

vendor container-libs w/o CNI

e3db014

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

go.mod: remove containernetworking/cni dependency

caaea7f

Remove the github.com/containernetworking/cni module from go.mod, go.sum, and vendor since it is no longer used. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 force-pushed the podman6-no-cni branch from e00419f to caaea7f Compare March 17, 2026 08:47

Luap99 approved these changes Mar 17, 2026

View reviewed changes

	# Remove /var/lib/cni, it is not required for rootless cni.
	# We have to test that it works without this directory.
	# https://github.com/containers/podman/issues/10857
	rm -rf /var/lib/cni

Conversation

lsm5 commented Oct 26, 2025

What type of PR is this?

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Oct 26, 2025

Uh oh!

packit-as-a-service bot commented Oct 26, 2025

Uh oh!

packit-as-a-service bot commented Oct 26, 2025

Uh oh!

github-actions bot commented Nov 26, 2025

Uh oh!

nalind left a comment

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

nalind Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

lsm5 commented Mar 12, 2026

Uh oh!

lsm5 commented Mar 12, 2026

Uh oh!

nalind Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Luap99 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Luap99 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants