tests: refresh kubernetes k3s pin and timeouts

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

Dockerfile

@@ -15,7 +15,7 @@ ARG BUILDKIT_VERSION=v0.29.0
 ARG COMPOSE_VERSION=v5.1.0
 ARG UNDOCK_VERSION=0.9.0
 ARG K3D_VERSION=5.8.3
-ARG K3S_VERSION=v1.32.2-k3s1
+ARG K3S_VERSION=v1.32.13-k3s1
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest

tests/helpers/k3d.go

@@ -33,7 +33,7 @@ func NewK3dServer(ctx context.Context, cfg *integration.BackendConfig, dockerAdd
 
 	clusterName = "bk-" + identity.NewID()
 
-	createCtx, cancelCreate := context.WithTimeout(ctx, 90*time.Second)
+	createCtx, cancelCreate := context.WithTimeoutCause(ctx, 90*time.Second, errors.New("timed out creating k3d cluster"))
 	defer cancelCreate()
 
 	args := []string{
@@ -48,11 +48,13 @@ func NewK3dServer(ctx context.Context, cfg *integration.BackendConfig, dockerAdd
 	cmd.Env = k3dEnv(dockerAddress)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		diag := KubernetesDiagnostics(clusterName, dockerAddress)
+		diag := KubernetesDiagnostics(ctx, clusterName, dockerAddress)
 		return "", "", nil, errors.Wrapf(err, "failed to create k3d cluster %s: %s\n%s\nouter dockerd logs: %s", clusterName, strings.TrimSpace(string(out)), diag, integration.FormatLogs(cfg.Logs))
 	}
 	deferF.Append(func() error {
-		cmd := exec.Command(k3dBin, "cluster", "delete", clusterName)
+		deleteCtx, cancelDelete := context.WithTimeoutCause(context.WithoutCancel(ctx), 30*time.Second, errors.New("timed out deleting k3d cluster"))
+		defer cancelDelete()
+		cmd := exec.CommandContext(deleteCtx, k3dBin, "cluster", "delete", clusterName)
 		cmd.Env = k3dEnv(dockerAddress)
 		out, err := cmd.CombinedOutput()
 		if err != nil {
@@ -61,14 +63,14 @@ func NewK3dServer(ctx context.Context, cfg *integration.BackendConfig, dockerAdd
 		return nil
 	})
 
-	kubeconfigCtx, cancelKubeconfig := context.WithTimeout(ctx, 30*time.Second)
+	kubeconfigCtx, cancelKubeconfig := context.WithTimeoutCause(ctx, 30*time.Second, errors.New("timed out writing k3d kubeconfig"))
 	defer cancelKubeconfig()
 
 	cmd = exec.CommandContext(kubeconfigCtx, k3dBin, "kubeconfig", "write", clusterName)
 	cmd.Env = k3dEnv(dockerAddress)
 	out, err = cmd.CombinedOutput()
 	if err != nil {
-		diag := KubernetesDiagnostics(clusterName, dockerAddress)
+		diag := KubernetesDiagnostics(ctx, clusterName, dockerAddress)
 		return "", "", nil, errors.Wrapf(err, "failed to write kubeconfig for cluster %s: %s\n%s\nouter dockerd logs: %s", clusterName, strings.TrimSpace(string(out)), diag, integration.FormatLogs(cfg.Logs))
 	}
 	kubeConfig = strings.TrimSpace(string(out))

tests/helpers/kubernetes_diagnostics.go

@@ -3,6 +3,7 @@ package helpers
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -35,8 +36,8 @@ func KubernetesK3DLoadBalancerImage() string {
 	return os.Getenv("TEST_K3D_LOADBALANCER_IMAGE")
 }
 
-func KubernetesDiagnostics(clusterName, dockerContext string) string {
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+func KubernetesDiagnostics(ctx context.Context, clusterName, dockerContext string) string {
+	ctx, cancel := context.WithTimeoutCause(context.WithoutCancel(ctx), 20*time.Second, errors.New("timed out collecting kubernetes diagnostics"))
 	defer cancel()
 
 	var buf bytes.Buffer

tests/workers/kubernetes.go

@@ -79,7 +79,7 @@ func (w *kubernetesWorker) New(ctx context.Context, cfg *integration.BackendConf
 	)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		diag := helpers.KubernetesDiagnostics(w.k3dName, w.docker.DockerAddress())
+		diag := helpers.KubernetesDiagnostics(ctx, w.k3dName, w.docker.DockerAddress())
 		return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s with image %s: %s\n%s", name, helpers.KubernetesBuildkitImage(), strings.TrimSpace(string(out)), diag)
 	}