diff --git a/dependencies.yaml b/dependencies.yaml index 3a09e2d2ed5..ef4865be6a1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -104,7 +104,7 @@ dependencies: match: go \d+.\d+ - name: "golang: after kubernetes/kubernetes update" - version: 1.20.5 + version: 1.20.6 refPaths: - path: images/releng/k8s-ci-builder/Dockerfile match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-\${OS_CODENAME} AS builder @@ -289,7 +289,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)" - version: v1.27.0-go1.20.5-bullseye.0 + version: v1.27.0-go1.20.6-bullseye.0 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index f890ed34525..4b04604196e 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,7 +1,7 @@ variants: v1.27-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.20.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.27.0-go1.20.6-bullseye.0' v1.26-cross1.20-bullseye: CONFIG: 'cross1.20' KUBE_CROSS_VERSION: 'v1.26.0-go1.20.5-bullseye.0' diff --git a/images/releng/k8s-ci-builder/Dockerfile b/images/releng/k8s-ci-builder/Dockerfile index 75ee882ce06..1cf5422a48a 100644 --- a/images/releng/k8s-ci-builder/Dockerfile +++ b/images/releng/k8s-ci-builder/Dockerfile @@ -17,7 +17,7 @@ ARG OS_CODENAME # The Golang version for the builder image should always be explicitly set to # the Golang version of the kubernetes/kubernetes active development branch -FROM golang:1.20.5-${OS_CODENAME} AS builder +FROM golang:1.20.6-${OS_CODENAME} AS builder WORKDIR /go/src/k8s.io/release diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 24b0e23667c..1c3fdfd1bad 100644 --- a/images/releng/k8s-ci-builder/Makefile +++ b/images/releng/k8s-ci-builder/Makefile @@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) TAG ?= $(shell git describe --tags --always --dirty) # Build args -GO_VERSION ?= 1.20.5 +GO_VERSION ?= 1.20.6 OS_CODENAME ?= bullseye IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG) diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index ea01dbd0c5a..dfab4af26ec 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,7 +1,7 @@ variants: default: CONFIG: default - GO_VERSION: '1.20.5' + GO_VERSION: '1.20.6' OS_CODENAME: 'bullseye' next: CONFIG: next @@ -13,7 +13,7 @@ variants: OS_CODENAME: 'bullseye' '1.27': CONFIG: '1.27' - GO_VERSION: '1.20.5' + GO_VERSION: '1.20.6' OS_CODENAME: 'bullseye' '1.26': CONFIG: '1.26'