Skip to content

K
k3s
Commit a93fbb10 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29235 from luxas/bump_etcd

Automatic merge from submit-queue Bump the default etcd version in the Makefile to 3.0.3 Fixes: #29132 I haven't had time to manually validate the arm and arm64 version yet, but I think it should be fine. cc @xiang90 @hongchaodeng @timothysc @lavalamp @wojtek-t @thockin @kubernetes/sig-scalability @Pensu @laboger
parents 1720b66d 62357bd7
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
cluster/images/etcd/Makefile
View file @ a93fbb10
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
# Usage: # Usage:
# [TAG=2.2.1] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [TAG=2.2.1] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
TAG?=2.2.5 TAG?=3.0.3
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.6.0 GOLANG_VERSION?=1.6.3
GOARM=6 GOARM=6
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
...@@ -49,10 +49,17 @@ else ...@@ -49,10 +49,17 @@ else
# Download etcd in a golang container and cross-compile it statically # Download etcd in a golang container and cross-compile it statically
docker run -it -v $(TEMP_DIR):/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \ docker run -it -v $(TEMP_DIR):/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \
"git clone https://github.com/coreos/etcd \ "git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \
&& cd etcd && git checkout v$(TAG) \ && cd /go/src/github.com/coreos/etcd \
&& git checkout v$(TAG) \
&& GOARM=$(GOARM) GOARCH=$(ARCH) ./build \ && GOARM=$(GOARM) GOARCH=$(ARCH) ./build \
&& cp bin/* /etcdbin" && cp bin/$(ARCH)/* /etcdbin"
# Add this ENV variable in order to workaround an unsupported arch blocker
# The multiarch feature is in an limited and experimental state right now, and etcd should work fine on arm64
# On arm (which is 32-bit), it can't handle >1GB data in-memory, but it is very unlikely someone tinkering with their limited arm devices would reach such a high usage
# ppc64le is still quite untested, but compiles and is probably in the process of being validated by IBM.
cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> Dockerfile
endif endif
# Replace BASEIMAGE with the real base image # Replace BASEIMAGE with the real base image
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment