File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -110,6 +110,8 @@ dependencies:
110
110
match : GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
111
111
- path : staging/publishing/rules.yaml
112
112
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+)?'
113
115
114
116
# Golang pre-releases are denoted as `1.y<pre-release stage>.z`
115
117
# Example: go1.16rc1
Original file line number Diff line number Diff line change 62
62
# This option is for running docker manifest command
63
63
export DOCKER_CLI_EXPERIMENTAL := enabled
64
64
# 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
66
66
GOARM? =7
67
67
TEMP_DIR: =$(shell mktemp -d)
68
68
@@ -94,10 +94,10 @@ build:
94
94
# Compile migrate
95
95
migrate_tmp_dir=$(shell mktemp -d); \
96
96
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"; \
98
98
$(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR); \
99
99
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"; \
101
101
$(BIN_INSTALL) $${migrate_tmp_dir}/cp $(TEMP_DIR);
102
102
103
103
ifeq ($(ARCH ) ,amd64)
You can’t perform that action at this time.
0 commit comments