Remove CNI for podman6

common/.golangci.yml

@@ -9,7 +9,6 @@ run:
     - systemd
     - exclude_graphdriver_btrfs
     - containers_image_openpgp
-    - cni
 
 formatters:
   enable:

common/Makefile

@@ -40,19 +40,15 @@ build-cross:
 	$(call go-build,freebsd,386,${BUILDTAGS})
 
 .PHONY: all
-all: build-amd64 build-386 build-amd64-cni
+all: build-amd64 build-386
 
 .PHONY: build
-build: build-amd64 build-386 build-amd64-cni
+build: build-amd64 build-386
 
 .PHONY: build-amd64
 build-amd64:
 	GOARCH=amd64 $(GO_BUILD) -tags $(BUILDTAGS) ./...
 
-.PHONY: build-amd64-cni
-build-amd64-cni:
-	GOARCH=amd64 $(GO_BUILD) -tags $(BUILDTAGS),cni ./...
-
 .PHONY: build-386
 build-386:
 ifneq ($(shell uname -s), Darwin)
@@ -106,7 +102,6 @@ test: test-unit
 test-unit: netavark-testplugin
 	go test --tags seccomp,$(BUILDTAGS) -v ./...
 	go test --tags remote,$(BUILDTAGS) -v ./pkg/config
-	go test --tags cni,$(BUILDTAGS) -v ./libnetwork/cni
 
 clean: ## Clean artifacts
 	$(MAKE) -C docs clean

common/docs/containers.conf.5.md

@@ -418,33 +418,13 @@ Specified as "directory-on-host:directory-in-container:options".
 Example:  "/db:/var/lib/db:ro".
 
 ## NETWORK TABLE
-The `network` table contains settings pertaining to the management of CNI
-plugins.
+The `network` table contains settings pertaining to the management of container
+networks.
 
 **network_backend**=""
 
 Network backend determines what network driver will be used to set up and tear down container networks.
-Valid values are "cni" and "netavark".
-The default value is empty which means that it will automatically choose CNI or netavark. If there are
-already containers/images or CNI networks preset it will choose CNI.
-
-Before changing this value all containers must be stopped otherwise it is likely that
-firewall rules and network interfaces might leak on the host. A reboot will fix this.
-
-**cni_plugin_dirs**=[]
-
-List of paths to directories where CNI plugin binaries are located.
-
-The default list is:
-```
-cni_plugin_dirs = [
-  "/usr/local/libexec/cni",
-  "/usr/libexec/cni",
-  "/usr/local/lib/cni",
-  "/usr/lib/cni",
-  "/opt/cni/bin",
-]
-```
+The only supported value is "netavark". An empty string defaults to "netavark".
 
 **netavark_plugin_dirs**=[]
 
@@ -498,12 +478,10 @@ default_subnet_pools = [
 Configure which rootless network program to use by default. Valid options are
 `slirp4netns` and `pasta` (default).
 
-**network_config_dir**="/etc/cni/net.d/"
+**network_config_dir**="/etc/containers/networks"
 
 Path to the directory where network configuration files are located.
-For the CNI backend the default is __/etc/cni/net.d__ as root
-and __$HOME/.config/cni/net.d__ as rootless.
-For the netavark backend "/etc/containers/networks" is used as root
+The default is "/etc/containers/networks" as root
 and "$graphroot/networks" as rootless.
 
 **firewall_driver**=""

common/go.mod

@@ -9,8 +9,6 @@ require (
 	github.com/checkpoint-restore/checkpointctl v1.5.0
 	github.com/checkpoint-restore/go-criu/v8 v8.2.0
 	github.com/containerd/platforms v1.0.0-rc.2
-	github.com/containernetworking/cni v1.3.0
-	github.com/containernetworking/plugins v1.9.0
 	github.com/containers/ocicrypt v1.2.1
 	github.com/coreos/go-systemd/v22 v22.7.0
 	github.com/cyphar/filepath-securejoin v0.6.1

common/go.sum

@@ -47,10 +47,6 @@ github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6a
 github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
 github.com/containerd/stargz-snapshotter/estargz v0.18.2 h1:yXkZFYIzz3eoLwlTUZKz2iQ4MrckBxJjkmD16ynUTrw=
 github.com/containerd/stargz-snapshotter/estargz v0.18.2/go.mod h1:XyVU5tcJ3PRpkA9XS2T5us6Eg35yM0214Y+wvrZTBrY=
-github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEmnuFjskwo=
-github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
-github.com/containernetworking/plugins v1.9.0 h1:Mg3SXBdRGkdXyFC4lcwr6u2ZB2SDeL6LC3U+QrEANuQ=
-github.com/containernetworking/plugins v1.9.0/go.mod h1:JG3BxoJifxxHBhG3hFyxyhid7JgRVBu/wtooGEvWf1c=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=