From 619abfec70a3f7f084d7f340f81233a97a67b4f8 Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 6 Oct 2023 15:18:34 +0200 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.21.2 Signed-off-by: cpanato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 6 +++--- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.go-version b/.go-version index 87967a790d6..6b1a92e6b66 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.1 \ No newline at end of file +1.21.2 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 34a24f9c90c..2449082f954 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.29.0-go1.21.1-bullseye.0 +v1.29.0-go1.21.2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 0001a2d5825..0580b72d89a 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.3.2 -readonly __default_go_runner_version=v2.3.1-go1.21.1-bookworm.0 +readonly __default_go_runner_version=v2.3.1-go1.21.2-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 311758d8d1b..44ab15d6634 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.21.1 + version: 1.21.2 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -138,7 +138,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.29.0-go1.21.1-bullseye.0 + version: v1.29.0-go1.21.2-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -184,7 +184,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.1-bookworm.0 + version: v2.3.1-go1.21.2-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 e4c4c5547ab..6106e82e45e 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2327,5 +2327,5 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.21.1 +default-go-version: 1.21.2 diff --git a/test/images/Makefile b/test/images/Makefile index a9c16e5b727..a554d4bee6a 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.21.1 +GOLANG_VERSION=1.21.2 export ifndef WHAT