✨ Sync Upstream CAPI 1.10.10 to internal fork release-1.10.10

.dockerignore

@@ -54,3 +54,5 @@ go.work.sum
 **/*.tmp
 **/.DS_Store
 **/*.swp
+
+tmp/

.trivyignore

@@ -1,3 +1,8 @@
 # According to govulncheck we are not using code that is affected by CVEs
 CVE-2025-47914
 CVE-2025-58181
+# otel CVE on Darwin
+CVE-2026-24051
+# Fix available in more recent versions
+CVE-2026-25679
+CVE-2026-27142

Makefile

@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.24.11
+GO_VERSION ?= 1.24.13
 GO_DIRECTIVE_VERSION ?= 1.23.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
@@ -139,7 +139,7 @@ HADOLINT_FAILURE_THRESHOLD = warning
 
 SHELLCHECK_VER := v0.9.0
 
-TRIVY_VER := 0.49.1
+TRIVY_VER := 0.69.2
 
 KPROMO_VER := 5ab0dbc74b0228c22a93d240596dff77464aee8f
 KPROMO_BIN := kpromo
@@ -768,8 +768,7 @@ verify-diagrams: generate-diagrams ## Verify generated diagrams are up to date
 .PHONY: verify-security
 verify-security: ## Verify code and images for vulnerabilities
 	$(MAKE) verify-container-images && R1=$$? || R1=$$?; \
-	$(MAKE) verify-govulncheck && R2=$$? || R2=$$?; \
-	if [ "$$R1" -ne "0" ] || [ "$$R2" -ne "0" ]; then \
+	if [ "$$R1" -ne "0" ]; then \
 	  echo "Check for vulnerabilities failed! There are vulnerabilities to be fixed"; \
 		exit 1; \
 	fi

Tiltfile

@@ -172,7 +172,7 @@ def load_provider_tilt_files():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.24.11 as tilt-helper
+FROM golang:1.24.13 as tilt-helper
 # Install delve. Note this should be kept in step with the Go release minor version.
 RUN go install github.com/go-delve/delve/cmd/dlv@v1.24
 # Support live reloading with Tilt
@@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 """
 
 tilt_dockerfile_header = """
-FROM golang:1.24.11 as tilt
+FROM golang:1.24.13 as tilt
 WORKDIR /
 COPY --from=tilt-helper /process.txt .
 COPY --from=tilt-helper /start.sh .

netlify.toml

@@ -4,7 +4,7 @@
     publish = "docs/book/book"
 
 [build.environment]
-    GO_VERSION = "1.24.11"
+    GO_VERSION = "1.24.13"
 
 # Standard Netlify redirects
 [[redirects]]

test/framework/clusterctl/repository.go

@@ -27,10 +27,13 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/blang/semver/v4"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
+	kerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/apimachinery/pkg/util/wait"
 
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/test/framework/exec"
@@ -275,21 +278,37 @@ func getComponentSourceFromURL(ctx context.Context, source ProviderVersionSource
 			return nil, errors.Wrap(err, "failed to read file")
 		}
 	case httpURIScheme, httpsURIScheme:
-		req, err := http.NewRequestWithContext(ctx, http.MethodGet, source.Value, http.NoBody)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to get %s: failed to create request", source.Value)
-		}
-		resp, err := http.DefaultClient.Do(req)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to get %s", source.Value)
-		}
-		if resp.StatusCode != http.StatusOK {
-			return nil, errors.Errorf("failed to get %s: got status code %d", source.Value, resp.StatusCode)
-		}
-		defer resp.Body.Close()
-		buf, err = io.ReadAll(resp.Body)
+		var getErr error
+		err := wait.ExponentialBackoff(wait.Backoff{
+			Steps:    5,
+			Duration: 100 * time.Millisecond,
+			Factor:   4.0,
+		}, func() (bool, error) {
+			req, err := http.NewRequestWithContext(ctx, http.MethodGet, source.Value, http.NoBody)
+			if err != nil {
+				getErr = errors.Wrapf(err, "failed to get %s: failed to create request", source.Value)
+				return false, nil
+			}
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				getErr = errors.Wrapf(err, "failed to get %s", source.Value)
+				return false, nil
+			}
+			if resp.StatusCode != http.StatusOK {
+				getErr = errors.Errorf("failed to get %s: got status code %d", source.Value, resp.StatusCode)
+				return false, nil
+			}
+			defer resp.Body.Close()
+			buf, err = io.ReadAll(resp.Body)
+			if err != nil {
+				getErr = errors.Wrapf(err, "failed to get %s: failed to read body", source.Value)
+				return false, nil
+			}
+
+			return true, nil
+		})
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to get %s: failed to read body", source.Value)
+			return nil, kerrors.NewAggregate([]error{err, getErr})
 		}
 	default:
 		return nil, errors.Errorf("unknown scheme for component source %q: allowed values are file, http, https", u.Scheme)