From 88e124ecaa4daacfde355ed61a4490aa849fc35c Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 8 Nov 2023 08:25:30 -0600 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.21.4 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 49340f5ac7b4d..3d8ac6371885a 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.3 \ No newline at end of file +1.21.4 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 2cb26245c0349..8ac11054699a0 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.29.0-go1.21.3-bullseye.0 +v1.29.0-go1.21.4-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 2c632b326c288..c4cd5bc445665 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.1 -readonly __default_go_runner_version=v2.3.1-go1.21.3-bookworm.0 +readonly __default_go_runner_version=v2.3.1-go1.21.4-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 c0d5fbd89ef05..8e14cb656776e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -118,7 +118,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.21.3 + version: 1.21.4 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -140,7 +140,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.29.0-go1.21.3-bullseye.0 + version: v1.29.0-go1.21.4-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -186,7 +186,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.3-bookworm.0 + version: v2.3.1-go1.21.4-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 892b8b89066ff..301d0dbdf55d1 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2327,4 +2327,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.21.3 +default-go-version: 1.21.4 diff --git a/test/images/Makefile b/test/images/Makefile index b45d0e52c3b89..6fb6d7c3e38b3 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.3 +GOLANG_VERSION=1.21.4 export ifndef WHAT