Rename netns-pool-size to cni-pool-size

Signed-off-by: Aaron Lehmann <alehmann@netflix.com>
moby · Sep 14, 2022 · f57dc7f · f57dc7f
1 parent 8c96330
commit f57dc7f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/cmd/buildkitd/config/config.go b/cmd/buildkitd/config/config.go
@@ -53,7 +53,7 @@ type NetworkConfig struct {
 	Mode          string `toml:"networkMode"`
 	CNIConfigPath string `toml:"cniConfigPath"`
 	CNIBinaryPath string `toml:"cniBinaryPath"`
-	NetNSPoolSize int    `toml:"netNSPoolSize"`
+	CNIPoolSize   int    `toml:"cniPoolSize"`
 }
 
 type OCIConfig struct {

diff --git a/cmd/buildkitd/main_containerd_worker.go b/cmd/buildkitd/main_containerd_worker.go
@@ -91,9 +91,9 @@ func init() {
 			Value: defaultConf.Workers.Containerd.NetworkConfig.CNIBinaryPath,
 		},
 		cli.IntFlag{
-			Name:  "containerd-netns-pool-size",
-			Usage: "size of network namespace pool",
-			Value: defaultConf.Workers.Containerd.NetworkConfig.NetNSPoolSize,
+			Name:  "containerd-cni-pool-size",
+			Usage: "size of cni network namespace pool",
+			Value: defaultConf.Workers.Containerd.NetworkConfig.CNIPoolSize,
 		},
 		cli.StringFlag{
 			Name:  "containerd-worker-snapshotter",
@@ -213,8 +213,8 @@ func applyContainerdFlags(c *cli.Context, cfg *config.Config) error {
 	if c.GlobalIsSet("containerd-cni-config-path") {
 		cfg.Workers.Containerd.NetworkConfig.CNIConfigPath = c.GlobalString("containerd-cni-config-path")
 	}
-	if c.GlobalIsSet("containerd-netns-pool-size") {
-		cfg.Workers.Containerd.NetworkConfig.NetNSPoolSize = c.GlobalInt("containerd-netns-pool-size")
+	if c.GlobalIsSet("containerd-cni-pool-size") {
+		cfg.Workers.Containerd.NetworkConfig.CNIPoolSize = c.GlobalInt("containerd-cni-pool-size")
 	}
 	if c.GlobalIsSet("containerd-cni-binary-dir") {
 		cfg.Workers.Containerd.NetworkConfig.CNIBinaryPath = c.GlobalString("containerd-cni-binary-dir")
@@ -255,7 +255,7 @@ func containerdWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([
 			Root:       common.config.Root,
 			ConfigPath: common.config.Workers.Containerd.CNIConfigPath,
 			BinaryDir:  common.config.Workers.Containerd.CNIBinaryPath,
-			PoolSize:   common.config.Workers.Containerd.NetNSPoolSize,
+			PoolSize:   common.config.Workers.Containerd.CNIPoolSize,
 		},
 	}
 

diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
@@ -101,16 +101,16 @@ func init() {
 			Usage: "path of cni binary files",
 			Value: defaultConf.Workers.OCI.NetworkConfig.CNIBinaryPath,
 		},
+		cli.IntFlag{
+			Name:  "oci-cni-pool-size",
+			Usage: "size of cni network namespace pool",
+			Value: defaultConf.Workers.OCI.NetworkConfig.CNIPoolSize,
+		},
 		cli.StringFlag{
 			Name:  "oci-worker-binary",
 			Usage: "name of specified oci worker binary",
 			Value: defaultConf.Workers.OCI.Binary,
 		},
-		cli.IntFlag{
-			Name:  "oci-netns-pool-size",
-			Usage: "size of network namespace pool",
-			Value: defaultConf.Workers.OCI.NetworkConfig.NetNSPoolSize,
-		},
 		cli.StringFlag{
 			Name:  "oci-worker-apparmor-profile",
 			Usage: "set the name of the apparmor profile applied to containers",
@@ -228,8 +228,8 @@ func applyOCIFlags(c *cli.Context, cfg *config.Config) error {
 	if c.GlobalIsSet("oci-cni-binary-dir") {
 		cfg.Workers.OCI.NetworkConfig.CNIBinaryPath = c.GlobalString("oci-cni-binary-dir")
 	}
-	if c.GlobalIsSet("oci-netns-pool-size") {
-		cfg.Workers.OCI.NetworkConfig.NetNSPoolSize = c.GlobalInt("oci-netns-pool-size")
+	if c.GlobalIsSet("oci-cni-pool-size") {
+		cfg.Workers.OCI.NetworkConfig.CNIPoolSize = c.GlobalInt("oci-cni-pool-size")
 	}
 	if c.GlobalIsSet("oci-worker-binary") {
 		cfg.Workers.OCI.Binary = c.GlobalString("oci-worker-binary")
@@ -290,7 +290,7 @@ func ociWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([]worker
 			Root:       common.config.Root,
 			ConfigPath: common.config.Workers.OCI.CNIConfigPath,
 			BinaryDir:  common.config.Workers.OCI.CNIBinaryPath,
-			PoolSize:   common.config.Workers.OCI.NetNSPoolSize,
+			PoolSize:   common.config.Workers.OCI.CNIPoolSize,
 		},
 	}
 

diff --git a/docs/buildkitd.toml.md b/docs/buildkitd.toml.md
@@ -57,9 +57,9 @@ insecure-entitlements = [ "network.host", "security.insecure" ]
   apparmor-profile = ""
   # limit the number of parallel build steps that can run at the same time
   max-parallelism = 4
-  # maintain a pool of reusable network namespaces to amortize the overhead
+  # maintain a pool of reusable CNI network namespaces to amortize the overhead
   # of allocating and releasing the namespaces
-  netNSPoolSize = 16
+  cniPoolSize = 16
 
   [worker.oci.labels]
     "foo" = "bar"
@@ -80,9 +80,9 @@ insecure-entitlements = [ "network.host", "security.insecure" ]
   gc = true
   # gckeepstorage sets storage limit for default gc profile, in MB.
   gckeepstorage = 9000
-  # maintain a pool of reusable network namespaces to amortize the overhead
+  # maintain a pool of reusable CNI network namespaces to amortize the overhead
   # of allocating and releasing the namespaces
-  netNSPoolSize = 16
+  cniPoolSize = 16
 
   [worker.containerd.labels]
     "foo" = "bar"