From 1c9e78534b0eadb8ae5e0582f0b4668430247368 Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Thu, 8 Sep 2022 21:55:18 +0530 Subject: [PATCH 1/3] Update k8s-cloud-builder variants to use Go 1.19.1 and Go 1.18.6 Signed-off-by: Nabarun Pal --- images/k8s-cloud-builder/variants.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index fc654ca82ff..6880aef18c9 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,10 +1,10 @@ variants: v1.25-cross1.19-bullseye: CONFIG: 'cross1.19' - KUBE_CROSS_VERSION: 'v1.25.0-go1.19-bullseye.0' + KUBE_CROSS_VERSION: 'v1.25.0-go1.19.1-bullseye.0' v1.24-cross1.18-bullseye: CONFIG: 'cross1.18' - KUBE_CROSS_VERSION: 'v1.24.0-go1.18.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.24.0-go1.18.6-bullseye.0' v1.23-cross1.17-bullseye: CONFIG: 'cross1.17' KUBE_CROSS_VERSION: 'v1.23.0-go1.17.13-bullseye.0' From 851de152b79e7873bae3637b1d5c723b53fbf630 Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Thu, 8 Sep 2022 21:56:13 +0530 Subject: [PATCH 2/3] Update k8s-ci-builder variants to use Go 1.19.1 and Go 1.18.6 Signed-off-by: Nabarun Pal --- images/releng/k8s-ci-builder/Dockerfile | 2 +- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/releng/k8s-ci-builder/Dockerfile b/images/releng/k8s-ci-builder/Dockerfile index 7d8d21ae430..cab4d357da0 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.18.5-${OS_CODENAME} AS builder +FROM golang:1.18.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 e777006ce14..c152e135647 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.18.5 +GO_VERSION ?= 1.18.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 88ebb311dec..9736698ece0 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,19 +1,19 @@ variants: default: CONFIG: default - GO_VERSION: '1.18.5' + GO_VERSION: '1.18.6' OS_CODENAME: 'bullseye' next: CONFIG: next - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' OS_CODENAME: 'bullseye' '1.25': CONFIG: '1.25' - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' OS_CODENAME: 'bullseye' '1.24': CONFIG: '1.24' - GO_VERSION: '1.18.5' + GO_VERSION: '1.18.6' OS_CODENAME: 'bullseye' '1.23': CONFIG: '1.23' From bb9d0b3e9849f1d603470236a5143139c90ad7c0 Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Thu, 8 Sep 2022 22:31:04 +0530 Subject: [PATCH 3/3] update dependencies to reflect Go 1.19.1 and Go 1.18.6 updates Signed-off-by: Nabarun Pal --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 560e247b9bd..516e5452d31 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -106,7 +106,7 @@ dependencies: match: go \d+.\d+ - name: "golang: after kubernetes/kubernetes update" - version: 1.18.5 + version: 1.18.6 refPaths: - path: images/releng/k8s-ci-builder/Dockerfile match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-\${OS_CODENAME} AS builder @@ -187,7 +187,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross: dependents bullseye" - version: v1.25.0-go1.19-bullseye.0 + version: v1.25.0-go1.19.1-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-]+)*))?)'" @@ -237,7 +237,7 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-bullseye'" - name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)" - version: v1.25.0-go1.19-bullseye.0 + version: v1.25.0-go1.19.1-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-]+)*))?)'" @@ -254,7 +254,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.24)" - version: 1.18.5 + version: 1.18.6 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?