From aac61cea97db45b10e52f2daa8534341e28cb730 Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 7 Jun 2022 13:32:07 +0200 Subject: [PATCH] Update Go to 1.18.3 Signed-off-by: cpanato --- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 6 +++--- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index f2e9914a6cd..5382fbd1658 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.25.0-go1.18.2-bullseye.0 +v1.25.0-go1.18.3-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 3373123c677..c8ac1fd93b4 100755 --- a/build/common.sh +++ b/build/common.sh @@ -91,7 +91,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_debian_iptables_version=bullseye-v1.3.0 -readonly __default_go_runner_version=v2.3.1-go1.18.2-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.18.3-bullseye.0 readonly __default_setcap_version=bullseye-v1.2.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3dc6282fce7..98d33c5ce48 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -88,7 +88,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.18.2 + version: 1.18.3 refPaths: - path: build/build-image/cross/VERSION - path: staging/publishing/rules.yaml @@ -110,7 +110,7 @@ dependencies: # match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.25.0-go1.18.2-bullseye.0 + version: v1.25.0-go1.18.3-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -140,7 +140,7 @@ dependencies: match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"} - name: "registry.k8s.io/go-runner: dependents" - version: v2.3.1-go1.18.2-bullseye.0 + version: v2.3.1-go1.18.3-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 fade9c34dd1..f971e669a43 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2295,4 +2295,4 @@ recursive-delete-patterns: - '*/BUILD.bazel' - Gopkg.toml - '*/.gitattributes' -default-go-version: 1.18.2 +default-go-version: 1.18.3 diff --git a/test/images/Makefile b/test/images/Makefile index e60536f9833..9766d6c0b61 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.18.2 +GOLANG_VERSION=1.18.3 export ifndef WHAT