From ee86ca9f13b268edf9e6b612e349a5d95551595e Mon Sep 17 00:00:00 2001 From: cpanato Date: Sat, 27 Jan 2024 14:47:03 +0100 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.22rc2 Signed-off-by: cpanato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 24 +++++++++++++----------- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.go-version b/.go-version index f7b31a92cdf..f8bb37dbb59 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22rc1 \ No newline at end of file +1.22rc2 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index d6c5e66c5c1..c5d5845dabb 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.30.0-go1.22rc1-bullseye.0 +v1.30.0-go1.22rc2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 09c3616d13c..a0c795c5232 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,7 +97,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.4.4 -readonly __default_go_runner_version=v2.3.1-go1.22rc1-bookworm.0 +readonly __default_go_runner_version=v2.3.1-go1.22rc2-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 1a8f74ff222..a52a040ee67 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -118,12 +118,13 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.21.6 + version: 1.22rc2 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+)?' + # TODO: remove this when whe have the go1.22 released and not the rc. + # - path: staging/publishing/rules.yaml + # match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' - path: test/images/Makefile match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ @@ -132,15 +133,16 @@ 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.21 - refPaths: - - path: build/build-image/cross/VERSION - - path: hack/lib/golang.sh - match: minimum_go_version=go([0-9]+\.[0-9]+) + # TODO: remove this when whe have the go1.22 released and not the rc. + # - name: "golang: 1." + # version: 1.22 + # refPaths: + # - path: build/build-image/cross/VERSION + # - path: hack/lib/golang.sh + # match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.30.0-go1.21.6-bullseye.0 + version: v1.30.0-go1.22rc2-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -186,7 +188,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.3.1-go1.21.6-bookworm.0 + version: v2.3.1-go1.22rc2-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 e4b2cb856a8..c0e51d38aa2 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2392,4 +2392,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22rc1 +default-go-version: 1.21.6 diff --git a/test/images/Makefile b/test/images/Makefile index 9c386ff94c1..d254959eef5 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.22rc1 +GOLANG_VERSION=1.22rc2 export ifndef WHAT