Skip to content

Commit 704628f

Browse files
committed
Update golang used in etcd image to 1.16.7
1 parent 07fe9f0 commit 704628f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

build/dependencies.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ dependencies:
110110
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
111111
- path: staging/publishing/rules.yaml
112112
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
113+
- path: cluster/images/etcd/Makefile
114+
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
113115

114116
# Golang pre-releases are denoted as `1.y<pre-release stage>.z`
115117
# Example: go1.16rc1

cluster/images/etcd/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ endif
6262
# This option is for running docker manifest command
6363
export DOCKER_CLI_EXPERIMENTAL := enabled
6464
# golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
65-
GOLANG_VERSION?=1.12.17
65+
GOLANG_VERSION?=1.16.7
6666
GOARM?=7
6767
TEMP_DIR:=$(shell mktemp -d)
6868

@@ -94,10 +94,10 @@ build:
9494
# Compile migrate
9595
migrate_tmp_dir=$(shell mktemp -d); \
9696
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) \
97-
/bin/bash -c "CGO_ENABLED=0 go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \
97+
/bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \
9898
$(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR); \
9999
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) \
100-
/bin/bash -c "CGO_ENABLED=0 go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \
100+
/bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \
101101
$(BIN_INSTALL) $${migrate_tmp_dir}/cp $(TEMP_DIR);
102102

103103
ifeq ($(ARCH),amd64)

0 commit comments

Comments
 (0)