From 69c4bc29f5539f5f61dceb035d568bc37708afaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Fri, 14 Jul 2023 12:04:13 +0200 Subject: [PATCH] [go] Bump images, versions and deps to use Go 1.20.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- .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 ae45fe86ffb..7ad32779d83 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.5 \ No newline at end of file +1.20.6 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 5451e5e9d37..6cd11464133 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.27.0-go1.20.5-bullseye.0 +v1.27.0-go1.20.6-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 12ba308ab22..8df9ec6f192 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.2.5 -readonly __default_go_runner_version=v2.3.1-go1.20.5-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.20.6-bullseye.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 298e3de6378..4cadacc5b27 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -114,7 +114,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.20.5 + version: 1.20.6 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -136,7 +136,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.27.0-go1.20.5-bullseye.0 + version: v1.27.0-go1.20.6-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -166,7 +166,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.20.5-bullseye.0 + version: v2.3.1-go1.20.6-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index ba2fa60b9eb..5ad1b2590c2 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2120,4 +2120,4 @@ rules: dir: staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.20.5 +default-go-version: 1.20.6 diff --git a/test/images/Makefile b/test/images/Makefile index efaeac81ba2..d5adf65d2df 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.20.5 +GOLANG_VERSION=1.20.6 export ifndef WHAT