Merge pull request #12948 from Luap99/rootless-networking

Remove rootless_networking option from containers.conf
containers · Jan 21, 2022 · 6e17158 · 6e17158
2 parents 02d8520 + ee039b7
commit 6e17158
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go
@@ -243,7 +243,6 @@ ExecStart=/usr/bin/sleep infinity
 `
 	containers := `[containers]
 netns="bridge"
-rootless_networking="cni"
 `
 	rootContainers := `[engine]
 machine_enabled=true

diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
@@ -353,11 +353,11 @@ func ParseNetworkFlag(networks []string) (Namespace, map[string]types.PerNetwork
 		toReturn.NSMode = FromPod
 	case ns == "" || ns == string(Default) || ns == string(Private):
 		// Net defaults to Slirp on rootless
-		if rootless.IsRootless() && containerConfig.Containers.RootlessNetworking != "cni" {
+		if rootless.IsRootless() {
 			toReturn.NSMode = Slirp
 			break
 		}
-		// if not slirp we use bridge
+		// if root we use bridge
 		fallthrough
 	case ns == string(Bridge), strings.HasPrefix(ns, string(Bridge)+":"):
 		toReturn.NSMode = Bridge