From 00ff4245e0201d2fe045ed87826737a73be6047d Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Fri, 19 Jun 2015 15:57:32 -0700 Subject: [PATCH 1/5] 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", From c3331c4f34130054c329461ba471b61454796f53 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 22 Jun 2015 10:43:25 -0700 Subject: [PATCH 2/5] Kubernetes version v0.19.2 --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index c1fe45cd63d..18d93754a22 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "19.1+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.19.1-dev" // version from git, output of $(git describe) + gitMinor string = "19.2" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.19.2" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 0e3030751240fe8c68b381ecf24ecd14c2b51393 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 22 Jun 2015 10:43:26 -0700 Subject: [PATCH 3/5] Kubernetes version v0.19.2-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 18d93754a22..2d4ea22666c 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "19.2" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.19.2" // version from git, output of $(git describe) + gitMinor string = "19.2+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.19.2-dev" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 3103c8ca0f24514bc39b6e2b7d909bbf46af8d11 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 22 Jun 2015 10:46:14 -0700 Subject: [PATCH 4/5] Kubernetes version v0.19.3 --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 2d4ea22666c..288142a6e50 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "19.2+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.19.2-dev" // version from git, output of $(git describe) + gitMinor string = "19.3" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.19.3" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 82ae56a918b5fed782d18dda71704aa0cb1a451e Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 22 Jun 2015 10:46:14 -0700 Subject: [PATCH 5/5] Kubernetes version v0.19.3-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 288142a6e50..bf60690fe89 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "19.3" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.19.3" // version from git, output of $(git describe) + gitMinor string = "19.3+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.19.3-dev" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" )