From efd8723ece7ff938581ddd35ee8b487b1a05336a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 23 Nov 2022 09:27:41 -0500 Subject: [PATCH] Bump GOLANG_VERSION to build etcd (from 1.16.x to 1.17.x) Also fix REVISION back to `0` this was missed in the previous PR Signed-off-by: Davanum Srinivas --- build/dependencies.yaml | 4 ++-- cluster/images/etcd/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 2ecdaac1ec8..f41f66379d4 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -81,10 +81,10 @@ dependencies: # From https://github.com/etcd-io/etcd/blob/main/Makefile - name: "golang: etcd release version" - version: 1.16.15 # for etcd v3.5.5: https://github.com/etcd-io/etcd/blob/19002cfc689fba2b8f56605e5797bf79f8b61fdd/Makefile#L58 + version: 1.17.13 # for etcd v3.5.6: https://github.com/etcd-io/etcd/blob/v3.5.6/Makefile#L58 golang version should be 1.16.15, BUT because of newer dependencies in our repository we use newer golang which has `unsafe.Slice` refPaths: - path: cluster/images/etcd/Makefile - match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' + match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?' # Golang - name: "golang: upstream version" diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index b89d2cc03d8..8350a397c5a 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.6 # REVISION provides a version number for this image and all it's bundled # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment # for each revision of this image at that etcd version. -REVISION?=1 +REVISION?=0 # IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) @@ -83,7 +83,7 @@ endif # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases. -GOLANG_VERSION?=1.16.15 +GOLANG_VERSION := 1.17.13 GOARM?=7 TEMP_DIR:=$(shell mktemp -d)