From 19311b932fbfffd2daa77559172bff9a355f9580 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 8 Oct 2025 15:02:48 -0700 Subject: [PATCH] reorder kube-cross to be under go version and dedupe it from the go version --- build/dependencies.yaml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 272db97e47c..586ddb6a292 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -120,10 +120,21 @@ dependencies: version: 1.25.1 refPaths: - path: .go-version - - path: build/build-image/cross/VERSION - path: staging/publishing/rules.yaml match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' + # This should ideally be updated to match the golang version + # but we can dynamically fetch go if the base image is out of date. + # This allows us to ship go updates more quickly. + # + # NOTE: To fully patch all binaries, go-runner and the related base images + # should also be updated, but go-runner is much harder to exploit and has + # far less relevancy to go updates for Kubernetes more generally. + - name: "registry.k8s.io/kube-cross: dependents" + version: v1.35.0-go1.25.1-bullseye.0 + refPaths: + - path: build/build-image/cross/VERSION + # Golang pre-releases are denoted as `1.y` # Example: go1.16rc1 # @@ -137,11 +148,6 @@ dependencies: - path: hack/lib/golang.sh match: minimum_go_version=go([0-9]+\.[0-9]+) - - name: "registry.k8s.io/kube-cross: dependents" - version: v1.35.0-go1.25.1-bullseye.0 - refPaths: - - path: build/build-image/cross/VERSION - # Base images - name: "registry.k8s.io/debian-base: dependents" version: bookworm-v1.0.4