From 3a9f05a1e6bc3d801fd45698a8f059de6505bb54 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Sat, 15 Feb 2025 13:09:34 -0500 Subject: [PATCH] Bump to build with go 1.23.6 --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 13 +++++++------ staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index fda2152c8a2..fa994bd7197 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.12 \ No newline at end of file +1.23.6 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 1543a2518e7..f7cd797fc87 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.31.0-go1.22.12-bullseye.0 +v1.31.0-go1.23.6-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 76ab27c7886..2aee171a0f9 100755 --- a/build/common.sh +++ b/build/common.sh @@ -98,7 +98,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.5.13 -readonly __default_go_runner_version=v2.4.0-go1.22.12-bookworm.0 +readonly __default_go_runner_version=v2.4.0-go1.23.6-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.3 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index e9c4b157337..b1261f75c3e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.22.12 + version: 1.23.6 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -131,14 +131,15 @@ dependencies: # This entry is a stub of the major version to allow dependency checks to # pass when building Kubernetes using a pre-release of Golang. - name: "golang: 1." - version: 1.22 + version: 1.23 refPaths: - path: build/build-image/cross/VERSION - - path: hack/lib/golang.sh - match: minimum_go_version=go([0-9]+\.[0-9]+) + # Disabled since incrementing from the original go minor for this release branch + # - path: hack/lib/golang.sh + # match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.31.0-go1.22.12-bullseye.0 + version: v1.31.0-go1.23.6-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -184,7 +185,7 @@ dependencies: match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"} - name: "registry.k8s.io/go-runner: dependents" - version: v2.4.0-go1.22.12-bookworm.0 + version: v2.4.0-go1.23.6-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 425abbb9fba..3d40f8f36d5 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2898,4 +2898,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22.12 +default-go-version: 1.23.6 diff --git a/test/images/Makefile b/test/images/Makefile index 1a6e5e6daf1..a2bd6fb83a3 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.22.12 +GOLANG_VERSION=1.23.6 export ifndef WHAT