From 9862afb0975defce5734874bdabf20dc3f20f205 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Sun, 13 Dec 2015 16:41:18 +0100
Subject: [PATCH] Upgrade kubernetes to v1.1.3
---
README.md | 2 +-
roles/download/defaults/main.yml | 6 +++---
roles/kubernetes/master/tasks/main.yml | 1 +
roles/kubernetes/node/defaults/main.yml | 6 ++++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 20ba6a65a..62fecf202 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The firewalls are not managed, you'll need to implement your own rules the way y
Ansible v1.9.x
### Components
-* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.2
+* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.3
* [etcd](https://github.com/coreos/etcd/releases) v2.2.2
* [calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.12.0
* [flanneld](https://github.com/coreos/flannel/releases) v0.5.5
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index d21b43752..a4739f0fc 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -2,9 +2,9 @@
etcd_version: v2.2.2
flannel_version: 0.5.5
-kube_version: v1.1.2
-kubectl_checksum: "e0585c6e63f796d87b34cd1f16554892a49421b98a2862a896b2b7ebf1439ace"
-kubelet_checksum: "6c029d34888e1ec4b9ab4b500b0712388984340488c5f3c19e2c759d1003cbff"
+kube_version: v1.1.3
+kubectl_checksum: "01b9bea18061a27b1cf30e34fd8ab45cfc096c9a9d57d0ed21072abb40dd3d1d"
+kubelet_checksum: "62191c66f2d670dd52ddf1d88ef81048977abf1ffaa95ee6333299447eb6a482"
calico_version: v0.12.0
diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml
index 12459956a..f6955f689 100644
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@@ -48,6 +48,7 @@
- name: wait for the apiserver to be running (pulling image and running container)
wait_for:
port: 8080
+ delay: 10
- name: install required python module 'httplib2'
apt:
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 209a2420f..fdea54b40 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -33,8 +33,10 @@ dns_domain: "{{ cluster_name }}"
kube_proxy_mode: userspace
hyperkube_image:
- name: gcr.io/google_containers/hyperkube
- tag: v1.1.2
+# Temporary image, waiting for official google release
+# name: gcr.io/google_containers/hyperkube
+ name: quay.io/smana/hyperkube
+ tag: v1.1.3
# IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS
--
GitLab