diff --git a/.go-version b/.go-version index 1b9335f13bc..ae45fe86ffb 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.4 \ No newline at end of file +1.20.5 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 18cfc544143..5451e5e9d37 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.27.0-go1.20.4-bullseye.0 +v1.27.0-go1.20.5-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 6f3f673b622..0377a6ccc3c 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.4 -readonly __default_go_runner_version=v2.3.1-go1.20.4-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.20.5-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 b4df39a862a..747bc09019c 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -95,7 +95,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.20.4 + version: 1.20.5 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.4-bullseye.0 + version: v1.27.0-go1.20.5-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.4-bullseye.0 + version: v2.3.1-go1.20.5-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 be4ce583b95..ffc92afd0c9 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 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.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -1120,7 +1120,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cri-api - name: release-1.27 - go: 1.20.4 + go: 1.20.5 source: branch: release-1.27 dir: staging/src/k8s.io/cri-api @@ -1189,7 +1189,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kubelet - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -1261,7 +1261,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-scheduler - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -1345,7 +1345,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/controller-manager - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -1449,7 +1449,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cloud-provider - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -1565,7 +1565,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kube-controller-manager - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -1631,7 +1631,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/cluster-bootstrap - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -1683,7 +1683,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/csi-translation-lib - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -1715,7 +1715,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/mount-utils - name: release-1.27 - go: 1.20.4 + go: 1.20.5 source: branch: release-1.27 dir: staging/src/k8s.io/mount-utils @@ -1826,7 +1826,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/legacy-cloud-providers - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -1940,7 +1940,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/kubectl - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -2032,7 +2032,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/pod-security-admission - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: api branch: release-1.27 @@ -2088,7 +2088,7 @@ rules: branch: release-1.26 dir: staging/src/k8s.io/dynamic-resource-allocation - name: release-1.27 - go: 1.20.4 + go: 1.20.5 dependencies: - repository: apimachinery branch: release-1.27 @@ -2105,4 +2105,4 @@ rules: dir: staging/src/k8s.io/dynamic-resource-allocation recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.20.4 +default-go-version: 1.20.5 diff --git a/test/images/Makefile b/test/images/Makefile index 0414c557848..efaeac81ba2 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.4 +GOLANG_VERSION=1.20.5 export ifndef WHAT