Merge pull request #572 from mheon/adjust_defaults

Use Private as default for rootless when we want CNI
containers · May 21, 2021 · d11e7ed · d11e7ed
2 parents bd27b0d + 834881a
commit d11e7ed
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -415,9 +415,6 @@ func probeConmon(conmonBinary string) error {
 
 // NetNS returns the default network namespace
 func (c *Config) NetNS() string {
-	if c.Containers.NetNS == "private" && unshare.IsRootless() {
-		return "slirp4netns"
-	}
 	return c.Containers.NetNS
 }