From 85fa3efc06bd6eb8c936370ecd6d2385a8dc4aac Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Wed, 29 Jun 2016 15:38:33 +0200
Subject: [PATCH] upgrade kubernetes to v1.2.5

---
 roles/download/vars/kube_versions.yml   | 4 ++++
 roles/kubernetes/node/defaults/main.yml | 2 +-
 roles/uploads/vars/kube_versions.yml    | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/roles/download/vars/kube_versions.yml b/roles/download/vars/kube_versions.yml
index a915bb258..b0653bba5 100644
--- a/roles/download/vars/kube_versions.yml
+++ b/roles/download/vars/kube_versions.yml
@@ -11,4 +11,8 @@ kube_checksum:
         kube_apiserver: 6ac99b36b02968459e026fcfc234207c66064b5e11816b69dd8fc234b2ffec1e
         kubectl: dac61fbd506f7a17540feca691cd8a9d9d628d59661eebce788a50511f578897
         kubelet: 4adaf40592248eef6fd4fa126464915ea41e624a70dc77178089760ed235e341
+    v1.2.5:
+        kube_apiserver: fbe8296ad4b194c06f6802a126d35cd2887dc1aded308d4da2b580f270412b33
+        kubectl: 5526a496a84701015485e32c86486e2f23599f7a865164f546e619c6a62f7f19
+        kubelet: cd15b929f0190876216f397c2c6e7aa8c08d3b047fd90b4980cd68c8f4896211
 kube_version: v1.2.4
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 98b1f8b7c..53eff0c4c 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -32,7 +32,7 @@ dns_domain: "{{ cluster_name }}"
 kube_proxy_mode: userspace
 
 hyperkube_image_repo: "quay.io/smana/kubernetes-hyperkube"
-hyperkube_image_tag: "v1.2.4"
+hyperkube_image_tag: "v1.2.5"
 
 # IP address of the DNS server.
 # Kubernetes will create a pod with several containers, serving as the DNS
diff --git a/roles/uploads/vars/kube_versions.yml b/roles/uploads/vars/kube_versions.yml
index a915bb258..b0653bba5 100644
--- a/roles/uploads/vars/kube_versions.yml
+++ b/roles/uploads/vars/kube_versions.yml
@@ -11,4 +11,8 @@ kube_checksum:
         kube_apiserver: 6ac99b36b02968459e026fcfc234207c66064b5e11816b69dd8fc234b2ffec1e
         kubectl: dac61fbd506f7a17540feca691cd8a9d9d628d59661eebce788a50511f578897
         kubelet: 4adaf40592248eef6fd4fa126464915ea41e624a70dc77178089760ed235e341
+    v1.2.5:
+        kube_apiserver: fbe8296ad4b194c06f6802a126d35cd2887dc1aded308d4da2b580f270412b33
+        kubectl: 5526a496a84701015485e32c86486e2f23599f7a865164f546e619c6a62f7f19
+        kubelet: cd15b929f0190876216f397c2c6e7aa8c08d3b047fd90b4980cd68c8f4896211
 kube_version: v1.2.4