From 00ff4245e0201d2fe045ed87826737a73be6047d Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Fri, 19 Jun 2015 15:57:32 -0700 Subject: [PATCH] rev etcd to 2.0.12 --- cluster/images/etcd/Makefile | 6 +++--- cluster/saltbase/salt/etcd/etcd.manifest | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 3e614a60821..2e23516c161 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -1,8 +1,8 @@ .PHONY: clean build push IMAGE = etcd -TAG = 2.0.9.1 -ETCD_VERSION = 2.0.9 +TAG = 2.0.12 +ETCD_VERSION = 2.0.12 OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64 clean: @@ -16,6 +16,6 @@ build: clean docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . push: build - gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG) + gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG) all: push diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest index 41aafc16f00..188ec8d7ab2 100644 --- a/cluster/saltbase/salt/etcd/etcd.manifest +++ b/cluster/saltbase/salt/etcd/etcd.manifest @@ -7,7 +7,7 @@ "containers":[ { "name": "etcd-container", - "image": "gcr.io/google_containers/etcd:2.0.9", + "image": "gcr.io/google_containers/etcd:2.0.12", "command": [ "/usr/local/bin/etcd", "--addr",