Skip to content

K
k3s
Commit bb8d2b21 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 -->
parents 0da589fa d22e7a1b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
cluster/images/etcd/Makefile
View file @ bb8d2b21
...@@ -17,7 +17,7 @@ ...@@ -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) ...@@ -78,4 +78,4 @@ ifeq ($(ARCH),amd64)
endif endif
all: build all: build
.PHONY: build push .PHONY: build push
\ No newline at end of file
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