github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #30309 from timothysc/etcd304 

Automatic merge from submit-queue

Update etcd makefile to build 3.0.4

Bumps the dependency, but we will also need someone to push to the google repos too.  

/cc @kubernetes/sig-scalability  

xref: #29235 #29399

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30309)
<!-- Reviewable:end -->
pull/6/head
Kubernetes Submit Queue 2016-08-10 01:23:19 -07:00 committed by GitHub
parent 0da589fa9c d22e7a1b4a
commit bb8d2b213d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/Makefile
View File

@ -17,7 +17,7 @@
# 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?=3.0.3 TAG?=3.0.4
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.6.3 GOLANG_VERSION?=1.6.3
@ -78,4 +78,4 @@ ifeq ($(ARCH),amd64)
endif endif
all: build all: build
.PHONY: build push .PHONY: build push