From 9528caa1d7a09330b147a2e2dcd3ee19f13c10bb Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Wed, 24 Feb 2016 11:33:41 +0100
Subject: [PATCH] Upgrade kuberenetes to v1.1.8
---
.travis.yml | 28 ++++++++++++-------------
README.md | 2 +-
roles/download/defaults/main.yml | 8 +++----
roles/kubernetes/node/defaults/main.yml | 4 +---
4 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index afbcfb2b0..12ea53edf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,22 +20,22 @@ env:
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=debian-8
- CLOUD_REGION=europe-west1-b
+ CLOUD_REGION=us-central1-c
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=debian-8
- CLOUD_REGION=europe-west1-b
+ CLOUD_REGION=us-east1-d
# Centos 7
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=centos-7-sudo
- CLOUD_REGION=us-central1-c
+ CLOUD_REGION=asia-east1-c
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=centos-7-sudo
- CLOUD_REGION=us-central1-c
+ CLOUD_REGION=europe-west1-b
- >-
KUBE_NETWORK_PLUGIN=weave
@@ -51,32 +51,32 @@ env:
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=rhel-7-sudo
- CLOUD_REGION=us-east1-d
+ CLOUD_REGION=asia-east1-c
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=rhel-7-sudo
- CLOUD_REGION=us-east1-d
+ CLOUD_REGION=europe-west1-b
# Ubuntu 14.04
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=ubuntu-1404-trusty
- CLOUD_REGION=europe-west1-c
+ CLOUD_REGION=us-central1-c
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=ubuntu-1404-trusty
- CLOUD_REGION=europe-west1-c
+ CLOUD_REGION=us-east1-d
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1404-trusty
- CLOUD_REGION=europe-west1-c
+ CLOUD_REGION=asia-east1-c
# Ubuntu 15.10
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=ubuntu-1510-wily
- CLOUD_REGION=us-central1-a
+ CLOUD_REGION=europe-west1-b
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=ubuntu-1510-wily
@@ -84,15 +84,13 @@ env:
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1510-wily
- CLOUD_REGION=us-central1-a
+ CLOUD_REGION=us-east1-d
matrix:
allow_failures:
-# - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c
-# - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=us-east1-d
- - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c
- - env: KUBE_NETWORK_PLUGIN=calico CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c
+ - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=asia-east1-c
+ - env: KUBE_NETWORK_PLUGIN=calico CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=us-east1-d
before_install:
# Install Ansible.
diff --git a/README.md b/README.md
index f5f0e2f9e..ed2e3dbf6 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ in order to avoid any issue during deployment you should disable your firewall
* Base knowledge on Ansible. Please refer to [Ansible documentation](http://www.ansible.com/how-ansible-works)
### Components
-* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.7
+* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.8
* [etcd](https://github.com/coreos/etcd/releases) v2.2.5
* [calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.16.1
* [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 6a0526a28..3363dc5ed 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -2,7 +2,7 @@
local_release_dir: /tmp
# Versions
-kube_version: v1.1.7
+kube_version: v1.1.8
etcd_version: v2.2.5
calico_version: v0.16.1
calico_cni_version: v1.0.0
@@ -22,9 +22,9 @@ calico_cni_checksum: "cfbb95d4416cb65845a188f3bd991fff232bd5ce3463b2919d586ab779
calico_cni_ipam_checksum: "93ebf8756b26314e1e3f612f1e824418cbb0a8df2942664422e697bcb109fbb2"
weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957"
etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756"
-kubectl_checksum: "7239fda83f0218384ccf3374a47c0d1e243975e50fdf5d544635a397c7ad10dc"
-kubelet_checksum: "05faa3cf5f5448efafa553a3ef778c645c59d585d4013b52fe7ca8bd4cfc704e"
-kube_apiserver_checksum: "bb73a3526e51a8f4124b42f6104103deba83f87bd985000c00d382b3a0af059a"
+kubectl_checksum: "b2222986e9f05da8091a16134022d243b3c46a5899486d1b775dbc950ebf36cd"
+kubelet_checksum: "a73cf50ce3da2d88a46064cd7e5ef48ece3c73518cf7a609ef8a680c214d3f4c"
+kube_apiserver_checksum: "aebb2c131674e231ba8dcad4438624c876627e77f47b0c6ef96bd21d23298ffa"
downloads:
- name: calico
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 96c9ce5c9..f915a84f6 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -31,10 +31,8 @@ dns_domain: "{{ cluster_name }}"
kube_proxy_mode: userspace
-# Temporary image, waiting for official google release
-# hyperkube_image_repo: gcr.io/google_containers/hyperkube
hyperkube_image_repo: quay.io/ant31/kubernetes-hyperkube
-hyperkube_image_tag: v1.1.7
+hyperkube_image_tag: v1.1.8
# IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS
--
GitLab