From 0ae902fca4ce538ccc1ae464e22cd963e0011265 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 11 May 2023 10:17:13 +0530 Subject: [PATCH 1/2] update golang version of etcd build to 1.19.9 As per https://github.com/etcd-io/etcd/blob/main/.go-version it is 1.19.9. Signed-off-by: Humble Chirammal --- cluster/images/etcd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 9b02d02c6b5..adb9bd60a5b 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -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.19.8 +GOLANG_VERSION := 1.19.9 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) From bfb4f8b7071a82ce63e31b3083e62385c88b6295 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 11 May 2023 10:20:44 +0530 Subject: [PATCH 2/2] etcd version monitor build go version update to 1.19.9 Signed-off-by: Humble Chirammal --- build/dependencies.yaml | 2 +- cluster/images/etcd-version-monitor/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 9af6c2a20d4..eaff4f0b170 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -88,7 +88,7 @@ dependencies: # From https://github.com/etcd-io/etcd/blob/main/Makefile - name: "golang: etcd release version" - version: 1.19.8 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md + version: 1.19.9 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md refPaths: - path: cluster/images/etcd/Makefile match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?' diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile index 93710a39ba1..5fd667fea32 100644 --- a/cluster/images/etcd-version-monitor/Makefile +++ b/cluster/images/etcd-version-monitor/Makefile @@ -15,10 +15,10 @@ # Build the etcd-version-monitor image # # Usage: -# [GOLANG_VERSION=1.8.3] [REGISTRY=staging-k8s.gcr.io] [TAG=test] make (build|push) +# [GOLANG_VERSION=1.19.9] [REGISTRY=staging-k8s.gcr.io] [TAG=test] make (build|push) # TODO(shyamjvs): Support architectures other than amd64 if needed. ARCH:=amd64 -GOLANG_VERSION?=1.19.8 +GOLANG_VERSION?=1.19.9 REGISTRY?=staging-k8s.gcr.io TAG?=0.1.3 IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)