From 704628fde41cd28844fedca4e2467b698e25f42c Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Wed, 11 Aug 2021 13:22:39 +0200 Subject: [PATCH] Update golang used in etcd image to 1.16.7 --- build/dependencies.yaml | 2 ++ cluster/images/etcd/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 52e16320765..3cd4e3d16d9 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -110,6 +110,8 @@ dependencies: match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ - path: staging/publishing/rules.yaml match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' + - path: cluster/images/etcd/Makefile + match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' # Golang pre-releases are denoted as `1.y.z` # Example: go1.16rc1 diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index ad0b56484a9..97f21ec2733 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -62,7 +62,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.12.17 +GOLANG_VERSION?=1.16.7 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) @@ -94,10 +94,10 @@ build: # Compile migrate migrate_tmp_dir=$(shell mktemp -d); \ docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ - /bin/bash -c "CGO_ENABLED=0 go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \ + /bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \ $(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR); \ docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ - /bin/bash -c "CGO_ENABLED=0 go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \ + /bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \ $(BIN_INSTALL) $${migrate_tmp_dir}/cp $(TEMP_DIR); ifeq ($(ARCH),amd64)