set -j to GOMAXPROCS at runtime

ko-build · Aug 10, 2021 · 5413ef4 · 5413ef4
1 parent d8a6e65
commit 5413ef4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/doc/ko_apply.md b/doc/ko_apply.md
@@ -57,7 +57,7 @@ ko apply -f FILENAME [flags]
       --image-label strings            Which labels (key=value) to add to the image.
       --insecure-registry              Whether to skip TLS verification on the registry
       --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-  -j, --jobs int                       The maximum number of concurrent builds (default 8)
+  -j, --jobs int                       The maximum number of concurrent builds (default GOMAXPROCS)
       --kubeconfig string              Path to the kubeconfig file to use for CLI requests.
   -L, --local                          Load into images to local docker daemon.
   -n, --namespace string               If present, the namespace scope for this CLI request

diff --git a/doc/ko_create.md b/doc/ko_create.md
@@ -57,7 +57,7 @@ ko create -f FILENAME [flags]
       --image-label strings            Which labels (key=value) to add to the image.
       --insecure-registry              Whether to skip TLS verification on the registry
       --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-  -j, --jobs int                       The maximum number of concurrent builds (default 8)
+  -j, --jobs int                       The maximum number of concurrent builds (default GOMAXPROCS)
       --kubeconfig string              Path to the kubeconfig file to use for CLI requests.
   -L, --local                          Load into images to local docker daemon.
   -n, --namespace string               If present, the namespace scope for this CLI request

diff --git a/doc/ko_publish.md b/doc/ko_publish.md
@@ -49,7 +49,7 @@ ko publish IMPORTPATH... [flags]
   -h, --help                     help for publish
       --image-label strings      Which labels (key=value) to add to the image.
       --insecure-registry        Whether to skip TLS verification on the registry
-  -j, --jobs int                 The maximum number of concurrent builds (default 8)
+  -j, --jobs int                 The maximum number of concurrent builds (default GOMAXPROCS)
   -L, --local                    Load into images to local docker daemon.
       --oci-layout-path string   Path to save the OCI image layout of the built images
       --platform string          Which platform to use when pulling a multi-platform base. Format: all | <os>[/<arch>[/<variant>]][,platform]*

diff --git a/doc/ko_resolve.md b/doc/ko_resolve.md
@@ -45,7 +45,7 @@ ko resolve -f FILENAME [flags]
   -h, --help                     help for resolve
       --image-label strings      Which labels (key=value) to add to the image.
       --insecure-registry        Whether to skip TLS verification on the registry
-  -j, --jobs int                 The maximum number of concurrent builds (default 8)
+  -j, --jobs int                 The maximum number of concurrent builds (default GOMAXPROCS)
   -L, --local                    Load into images to local docker daemon.
       --oci-layout-path string   Path to save the OCI image layout of the built images
       --platform string          Which platform to use when pulling a multi-platform base. Format: all | <os>[/<arch>[/<variant>]][,platform]*

diff --git a/doc/ko_run.md b/doc/ko_run.md
@@ -36,7 +36,7 @@ ko run IMPORTPATH [flags]
   -h, --help                     help for run
       --image-label strings      Which labels (key=value) to add to the image.
       --insecure-registry        Whether to skip TLS verification on the registry
-  -j, --jobs int                 The maximum number of concurrent builds (default 8)
+  -j, --jobs int                 The maximum number of concurrent builds (default GOMAXPROCS)
   -L, --local                    Load into images to local docker daemon.
       --oci-layout-path string   Path to save the OCI image layout of the built images
       --platform string          Which platform to use when pulling a multi-platform base. Format: all | <os>[/<arch>[/<variant>]][,platform]*

diff --git a/pkg/commands/options/build.go b/pkg/commands/options/build.go
@@ -17,8 +17,6 @@ limitations under the License.
 package options
 
 import (
-	"runtime"
-
 	"github.com/spf13/cobra"
 )
 
@@ -44,8 +42,8 @@ type BuildOptions struct {
 }
 
 func AddBuildOptions(cmd *cobra.Command, bo *BuildOptions) {
-	cmd.Flags().IntVarP(&bo.ConcurrentBuilds, "jobs", "j", runtime.GOMAXPROCS(0),
-		"The maximum number of concurrent builds")
+	cmd.Flags().IntVarP(&bo.ConcurrentBuilds, "jobs", "j", 0,
+		"The maximum number of concurrent builds (default GOMAXPROCS)")
 	cmd.Flags().BoolVar(&bo.DisableOptimizations, "disable-optimizations", bo.DisableOptimizations,
 		"Disable optimizations when building Go code. Useful when you want to interactively debug the created container.")
 	cmd.Flags().StringVar(&bo.Platform, "platform", "",

diff --git a/pkg/commands/resolver.go b/pkg/commands/resolver.go
@@ -26,6 +26,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 	"sync"
 
@@ -127,6 +128,9 @@ func makeBuilder(ctx context.Context, bo *options.BuildOptions) (*build.Caching,
 		return nil, err
 	}
 
+	if bo.ConcurrentBuilds == 0 {
+		bo.ConcurrentBuilds = runtime.GOMAXPROCS(0)
+	}
 	innerBuilder = build.NewLimiter(innerBuilder, bo.ConcurrentBuilds)
 
 	// tl;dr Wrap builder in a caching builder.