From a1bc11cf8d3713b7820169cc2c86c7c9acba79b1 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 14 Jul 2021 10:40:37 -0400 Subject: [PATCH 1/4] k8s-ci-builder: Add 1.22 variant, drop 1.18 variant Signed-off-by: Stephen Augustus --- images/releng/k8s-ci-builder/variants.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 2e14e58fdb2..7749f91a9e4 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -4,6 +4,11 @@ variants: GO_VERSION: '1.16.5' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' + '1.22': + CONFIG: '1.22' + GO_VERSION: '1.16.5' + BAZEL_VERSION: '3.4.1' + OLD_BAZEL_VERSION: '2.2.0' '1.21': CONFIG: '1.21' GO_VERSION: '1.16.5' @@ -19,8 +24,3 @@ variants: GO_VERSION: '1.15.13' BAZEL_VERSION: '2.2.0' OLD_BAZEL_VERSION: '0.23.2' - '1.18': - CONFIG: '1.18' - GO_VERSION: '1.13.15' - BAZEL_VERSION: '2.2.0' - OLD_BAZEL_VERSION: '0.23.2' From b868dc23bf7322a855e0ee915394323743ae94e8 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 14 Jul 2021 10:44:16 -0400 Subject: [PATCH 2/4] k8s-ci-builder: Add 1.23 variant Signed-off-by: Stephen Augustus --- dependencies.yaml | 4 ---- images/releng/k8s-ci-builder/variants.yaml | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3fc9136596c..d04573b3fc4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -172,10 +172,6 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - path: images/releng/ci/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - - name: "golang: after kubernetes/kubernetes update (next candidate)" - version: 1.16.5 - refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 7749f91a9e4..b86e60cd2d1 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -4,6 +4,11 @@ variants: GO_VERSION: '1.16.5' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' + '1.23': + CONFIG: '1.23' + GO_VERSION: '1.17rc1' + BAZEL_VERSION: '3.4.1' + OLD_BAZEL_VERSION: '2.2.0' '1.22': CONFIG: '1.22' GO_VERSION: '1.16.5' From 817dd10fcc0e1cfbf942aa8eda5f2ab195539c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Tue, 13 Jul 2021 23:20:37 -0500 Subject: [PATCH 3/4] k8s-ci-builder: Build go1.16.6 images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit modifies the k8s-ci-builder files and the dependencies.yaml manifest to golang 1.16.6. Signed-off-by: Adolfo García Veytia (Puerco) Co-authored-by: Stephen Augustus --- dependencies.yaml | 2 +- images/releng/k8s-ci-builder/Dockerfile | 2 +- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d04573b3fc4..e88049fefaf 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -97,7 +97,7 @@ dependencies: match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update" - version: 1.16.5 + version: 1.16.6 refPaths: - path: images/releng/k8s-ci-builder/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? diff --git a/images/releng/k8s-ci-builder/Dockerfile b/images/releng/k8s-ci-builder/Dockerfile index 571750f9eb3..332e04016a7 100644 --- a/images/releng/k8s-ci-builder/Dockerfile +++ b/images/releng/k8s-ci-builder/Dockerfile @@ -17,7 +17,7 @@ ARG OLD_BAZEL_VERSION # 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.16.5 AS builder +FROM golang:1.16.6 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 8b0dcce2321..cc897cf6a67 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.16.5 +GO_VERSION ?= 1.16.6 BAZEL_VERSION ?= 3.4.1 OLD_BAZEL_VERSION ?= 2.2.0 IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG) diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index b86e60cd2d1..ad07c475ca9 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.16.5' + GO_VERSION: '1.16.6' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' '1.23': @@ -11,12 +11,12 @@ variants: OLD_BAZEL_VERSION: '2.2.0' '1.22': CONFIG: '1.22' - GO_VERSION: '1.16.5' + GO_VERSION: '1.16.6' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' '1.21': CONFIG: '1.21' - GO_VERSION: '1.16.5' + GO_VERSION: '1.16.6' BAZEL_VERSION: '3.4.1' OLD_BAZEL_VERSION: '2.2.0' '1.20': From 99473d2fde174f83ec30311654a9d8f5ef54edcf Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 14 Jul 2021 11:05:09 -0400 Subject: [PATCH 4/4] k8s-cloud-builder: Build v1.17.0-rc.1-1 image Signed-off-by: Stephen Augustus --- dependencies.yaml | 2 +- images/k8s-cloud-builder/variants.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index e88049fefaf..5ae32b25956 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -207,7 +207,7 @@ dependencies: match: go\d+.\d+ - name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)" - version: v1.16.6-1 + version: v1.17.0-rc.1-1 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+ diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index 0dc2ee8d0ba..6d0b6cc701a 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,4 +1,7 @@ variants: + cross1.17: + CONFIG: 'cross1.17' + KUBE_CROSS_VERSION: 'v1.17.0-rc.1-1' cross1.16: CONFIG: 'cross1.16' KUBE_CROSS_VERSION: 'v1.16.6-1'