[feat]: [CI-15951]: Allow to configure buildkit version, timeouts (#55)

* [feat]: [CI-15951]: Allow to configure buildkit version, tlshandshaketimeout, responseheaderstimeout

* Update buildx.go

* Update app.go

* Update version.json

Author: anurag-harness

.gitignore

@@ -3,4 +3,5 @@ coverage.out
 vendor
 .vscode/
 Dockerfile
-buildkit/*.tar
+buildkit/*.tar
+.idea

app.go

@@ -385,6 +385,16 @@ func Run() {
 			Usage:  "Buildkit version to use",
 			EnvVar: "PLUGIN_BUILDKIT_VERSION",
 		},
+		cli.StringFlag{
+			Name:   "buildkit-tls-handshake-timeout",
+			Usage:  "Buildkit TLS handshake timeout override. Default value is 10s",
+			EnvVar: "PLUGIN_BUILDKIT_TLS_HANDSHAKE_TIMEOUT",
+		},
+		cli.StringFlag{
+			Name:   "buildkit-response-header-timeout",
+			Usage:  "Buildkit response header timeout override. Default value is 30s",
+			EnvVar: "PLUGIN_BUILDKIT_RESPONSE_HEADER_TIMEOUT",
+		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -461,15 +471,17 @@ func run(c *cli.Context) error {
 			ArtifactRegistry: c.String("artifact.registry"),
 		},
 		Builder: Builder{
-			Name:              c.String("builder-name"),
-			DaemonConfig:      c.String("builder-daemon-config"),
-			Driver:            c.String("builder-driver"),
-			DriverOpts:        c.Generic("builder-driver-opts").(*CustomStringSliceFlag).GetValue(),
-			DriverOptsNew:     c.Generic("builder-driver-opts-new").(*CustomStringSliceFlag).GetValue(),
-			RemoteConn:        c.String("builder-remote-conn"),
-			UseLoadedBuildkit: c.BoolT("use-loaded-buildkit"),
-			AssestsDir:        c.String("buildkit-assets-dir"),
-			BuildkitVersion:   c.String("buildkit-version"),
+			Name:                          c.String("builder-name"),
+			DaemonConfig:                  c.String("builder-daemon-config"),
+			Driver:                        c.String("builder-driver"),
+			DriverOpts:                    c.Generic("builder-driver-opts").(*CustomStringSliceFlag).GetValue(),
+			DriverOptsNew:                 c.Generic("builder-driver-opts-new").(*CustomStringSliceFlag).GetValue(),
+			RemoteConn:                    c.String("builder-remote-conn"),
+			UseLoadedBuildkit:             c.BoolT("use-loaded-buildkit"),
+			AssestsDir:                    c.String("buildkit-assets-dir"),
+			BuildkitVersion:               c.String("buildkit-version"),
+			BuildkitTLSHandshakeTimeout:   c.String("buildkit-tls-handshake-timeout"),
+			BuildkitResponseHeaderTimeout: c.String("buildkit-response-header-timeout"),
 		},
 		BaseImageRegistry: c.String("docker.baseimageregistry"),
 		BaseImageUsername: c.String("docker.baseimageusername"),

buildkit/version.json

@@ -1,3 +1,3 @@
 {
-    "buildkit_version": "harness/buildkit:1.0.6"
+    "buildkit_version": "harness/buildkit:1.0.7"
 }

buildx.go

@@ -1,7 +1,9 @@
 package docker
 
 import (
+	"fmt"
 	"os/exec"
+	"strings"
 )
 
 const (
@@ -24,6 +26,17 @@ func cmdSetupBuildx(builder Builder, driverOpts []string) *exec.Cmd {
 	if builder.RemoteConn != "" && builder.Driver == remoteDriver {
 		args = append(args, builder.RemoteConn)
 	}
+	// Collect buildkitd flags
+	var buildkitdFlags []string
+	if builder.BuildkitTLSHandshakeTimeout != "" {
+		buildkitdFlags = append(buildkitdFlags, fmt.Sprintf("--tls-handshake-timeout=%s", builder.BuildkitTLSHandshakeTimeout))
+	}
+	if builder.BuildkitResponseHeaderTimeout != "" {
+		buildkitdFlags = append(buildkitdFlags, fmt.Sprintf("--response-header-timeout=%s", builder.BuildkitResponseHeaderTimeout))
+	}
+	if len(buildkitdFlags) > 0 {
+		args = append(args, "--buildkitd-flags", strings.Join(buildkitdFlags, " "))
+	}
 	return exec.Command(dockerExe, args...)
 }
 

docker.go

@@ -35,15 +35,17 @@ type (
 	}
 
 	Builder struct {
-		Name              string   // Buildx builder name
-		DaemonConfig      string   // Buildx daemon config file path
-		Driver            string   // Buildx driver type
-		DriverOpts        []string // Buildx driver opts
-		DriverOptsNew     []string // Buildx driver opts new
-		RemoteConn        string   // Buildx remote connection endpoint
-		UseLoadedBuildkit bool     // Use loaded buildkit or no
-		AssestsDir        string   // Assets directory
-		BuildkitVersion   string   // Buildkit version
+		Name                          string   // Buildx builder name
+		DaemonConfig                  string   // Buildx daemon config file path
+		Driver                        string   // Buildx driver type
+		DriverOpts                    []string // Buildx driver opts
+		DriverOptsNew                 []string // Buildx driver opts new
+		RemoteConn                    string   // Buildx remote connection endpoint
+		UseLoadedBuildkit             bool     // Use loaded buildkit or no
+		AssestsDir                    string   // Assets directory
+		BuildkitVersion               string   // Buildkit version
+		BuildkitTLSHandshakeTimeout   string   // Buildkit TLS handshake timeout
+		BuildkitResponseHeaderTimeout string   // Buildkit response header timeout
 	}
 
 	// Login defines Docker login parameters.
@@ -288,6 +290,10 @@ func (p Plugin) Exec() error {
 
 		shouldFallback := true
 		if len(p.Builder.DriverOptsNew) != 0 {
+			if p.Builder.BuildkitVersion != "" {
+				fmt.Printf("Using BuildKit Version with new driver opts: %s\n", p.Builder.BuildkitVersion)
+				updateImageVersion(&p.Builder.DriverOptsNew, p.Builder.BuildkitVersion)
+			}
 			createCmd := cmdSetupBuildx(p.Builder, p.Builder.DriverOptsNew)
 			raw, err = createCmd.Output()
 			if err != nil {
@@ -302,6 +308,7 @@ func (p Plugin) Exec() error {
 					fmt.Printf("Error while inspecting buildx builder with new driver opts: %s\n", err)
 					// Mark that the fallback will be used
 					shouldFallback = true
+					p.Builder.Name = ""
 				} else {
 					shouldFallback = false
 				}
@@ -311,10 +318,10 @@ func (p Plugin) Exec() error {
 			// Main code block
 			if (p.Builder.UseLoadedBuildkit && loadedBuildkitTarball && loadedBuildkitVersion) || p.Builder.BuildkitVersion != "" {
 				var version string
-				if p.Builder.UseLoadedBuildkit && loadedBuildkitTarball && loadedBuildkitVersion {
-					version = config.BuildkitVersion
-				} else {
+				if p.Builder.BuildkitVersion != "" {
 					version = p.Builder.BuildkitVersion
+				} else if p.Builder.UseLoadedBuildkit && loadedBuildkitTarball && loadedBuildkitVersion {
+					version = config.BuildkitVersion
 				}
 				fmt.Printf("Using BuildKit Version: %s\n", version)
 				updateImageVersion(&p.Builder.DriverOpts, version)