From 2e9d10e8c6787d14b4fd29759990b83890c50c86 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 13 Apr 2022 16:44:21 +0200 Subject: [PATCH] Update Go to 1.18.1 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 58999673e0c..03465525168 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.24.0-go1.18-bullseye.0 +v1.24.0-go1.18.1-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 25938ccaae8..64482cb0903 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.1.0 -readonly __default_go_runner_version=v2.3.1-go1.18-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.18.1-bullseye.0 readonly __default_setcap_version=bullseye-v1.0.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index d3a7175f3b1..10323ab4e66 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -80,7 +80,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.18 + version: 1.18.1 refPaths: - path: build/build-image/cross/VERSION - path: staging/publishing/rules.yaml @@ -108,7 +108,7 @@ dependencies: match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.24.0-go1.18-bullseye.0 + version: v1.24.0-go1.18.1-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -138,7 +138,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: "k8s.gcr.io/go-runner: dependents" - version: v2.3.1-go1.18-bullseye.0 + version: v2.3.1-go1.18.1-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 1dff52fa90d..72c723de55e 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -8,7 +8,7 @@ recursive-delete-patterns: - "*/BUILD.bazel" - Gopkg.toml - "*/.gitattributes" -default-go-version: 1.18 +default-go-version: 1.18.1 rules: - destination: code-generator branches: diff --git a/test/images/Makefile b/test/images/Makefile index 7158f24e016..a6b1829f2fb 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.18 +GOLANG_VERSION=1.18.1 export ifndef WHAT