From 2a69edb43de2f33dd967bcf3b3a013d239a15c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Wed, 5 Apr 2023 23:46:34 +0200 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.20.3 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 | 60 ++++++++++++++++----------------- test/images/Makefile | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.go-version b/.go-version index 341e509f13e..3cb1511de67 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.2 \ No newline at end of file +1.20.3 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 87a27613726..d7dd0f94612 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.27.0-go1.20.2-bullseye.0 +v1.27.0-go1.20.3-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 4022ce924b8..7f38488454a 100755 --- a/build/common.sh +++ b/build/common.sh @@ -96,7 +96,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.2 -readonly __default_go_runner_version=v2.3.1-go1.20.2-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.20.3-bullseye.0 readonly __default_setcap_version=bullseye-v1.4.2 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 6489375a86f..9671222f096 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -95,7 +95,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.20.2 + version: 1.20.3 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -117,7 +117,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.27.0-go1.20.2-bullseye.0 + version: v1.27.0-go1.20.3-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -147,7 +147,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.2-bullseye.0 + version: v2.3.1-go1.20.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 680b2107da1..fc28d0173a5 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -21,7 +21,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/code-generator - name: release-1.27 - go: 1.20.2 + go: 1.20.3 source: branch: release-1.27 dir: staging/src/k8s.io/code-generator @@ -47,7 +47,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/apimachinery - name: release-1.27 - go: 1.20.2 + go: 1.20.3 source: branch: release-1.27 dir: staging/src/k8s.io/apimachinery @@ -86,7 +86,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/api - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -152,7 +152,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -216,7 +216,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/component-base - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -278,7 +278,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/component-helpers - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -309,7 +309,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kms - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -383,7 +383,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/apiserver - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -477,7 +477,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-aggregator - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -594,7 +594,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -696,7 +696,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -800,7 +800,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -879,7 +879,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/metrics - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -943,7 +943,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cli-runtime - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1013,7 +1013,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/sample-cli-plugin - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1084,7 +1084,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-proxy - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -1156,7 +1156,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kubelet - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -1228,7 +1228,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-scheduler - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -1312,7 +1312,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/controller-manager - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1416,7 +1416,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cloud-provider - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1532,7 +1532,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-controller-manager - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -1598,7 +1598,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cluster-bootstrap - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -1650,7 +1650,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/csi-translation-lib - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1682,7 +1682,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/mount-utils - name: release-1.27 - go: 1.20.2 + go: 1.20.3 source: branch: release-1.27 dir: staging/src/k8s.io/mount-utils @@ -1793,7 +1793,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/legacy-cloud-providers - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -1839,7 +1839,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cri-api - name: release-1.27 - go: 1.20.2 + go: 1.20.3 source: branch: release-1.27 dir: staging/src/k8s.io/cri-api @@ -1934,7 +1934,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kubectl - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -2026,7 +2026,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/pod-security-admission - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: api branch: release-1.27 @@ -2078,7 +2078,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/dynamic-resource-allocation - name: release-1.27 - go: 1.20.2 + go: 1.20.3 dependencies: - repository: apimachinery branch: release-1.27 @@ -2095,4 +2095,4 @@ rules: dir: staging/src/k8s.io/dynamic-resource-allocation recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.20.2 +default-go-version: 1.20.3 diff --git a/test/images/Makefile b/test/images/Makefile index a7212862a24..d464ad34d00 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.2 +GOLANG_VERSION=1.20.3 export ifndef WHAT