From 3cd89bed45de4264794c57b05cccd8bae01d68e8 Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Mon, 11 Apr 2016 12:19:09 +0200
Subject: [PATCH] Kubernetes upgrade to 1.2.2
---
roles/download/defaults/main.yml | 8 ++++----
roles/kubernetes/node/defaults/main.yml | 2 +-
roles/uploads/defaults/main.yml | 8 ++++----
roles/uploads/tasks/main.yml | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 0d45f09ae..10d69b817 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.2.1
+kube_version: v1.2.2
etcd_version: v2.2.5
calico_version: v0.17.0
calico_cni_version: v1.0.0
@@ -25,9 +25,9 @@ calico_cni_checksum: "cfbb95d4416cb65845a188f3bd991fff232bd5ce3463b2919d586ab779
calico_cni_ipam_checksum: "93ebf8756b26314e1e3f612f1e824418cbb0a8df2942664422e697bcb109fbb2"
weave_checksum: "152942c330f87ab475d87d9311b91674b90f25ea685bd4e04e0495d5fe09a957"
etcd_checksum: "aa6037406257d2a1bc48ffa769afe7a4f8a04cc1ffcd36ef84f9ee8bc4eca756"
-kubectl_checksum: "a41b9543ddef1f64078716075311c44c6e1d02c67301c0937a658cef37923bbb"
-kubelet_checksum: "7e253e07da77b031d5687102c485697f95f9e1e6410c1da1f4d3f064cdc70f07"
-kube_apiserver_checksum: "8e00cd59330857b119e40cd6156c0f476a8e62bbc9e9addd524b39e0c390a6cd"
+kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4"
+kubelet_checksum: "f16827dc7e7c82f0e215f0fc73eb01e2dfe91a2ec83f9cbcaf8d37c91b64fd3b"
+kube_apiserver_checksum: "eb1bfd8b877052cbd1991b8c429a1d06661f4cb019905e20e128174f724e16de"
downloads:
- name: calico
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 37b056a78..63320f6fe 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.1
+hyperkube_image_tag: v1.2.2
# IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index c46de1a23..70a956af1 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -2,7 +2,7 @@
local_release_dir: /tmp
# Versions
-kube_version: v1.2.1
+kube_version: v1.2.2
etcd_version: v2.2.5
calico_version: v0.17.0
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: "a41b9543ddef1f64078716075311c44c6e1d02c67301c0937a658cef37923bbb"
-kubelet_checksum: "7e253e07da77b031d5687102c485697f95f9e1e6410c1da1f4d3f064cdc70f07"
-kube_apiserver_checksum: "8e00cd59330857b119e40cd6156c0f476a8e62bbc9e9addd524b39e0c390a6cd"
+kubectl_checksum: "473e6924569fba30d4a50cecdc2cae5f31d97d1f662463e85b74a472105dcff4"
+kubelet_checksum: "f16827dc7e7c82f0e215f0fc73eb01e2dfe91a2ec83f9cbcaf8d37c91b64fd3b"
+kube_apiserver_checksum: "eb1bfd8b877052cbd1991b8c429a1d06661f4cb019905e20e128174f724e16de"
downloads:
- name: calico
diff --git a/roles/uploads/tasks/main.yml b/roles/uploads/tasks/main.yml
index 68523eca0..71330edaa 100644
--- a/roles/uploads/tasks/main.yml
+++ b/roles/uploads/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Create dest directories
file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes
- with_items: downloads
+ with_items: '{{downloads}}'
- name: Download items
get_url:
@@ -10,7 +10,7 @@
sha256sum: "{{item.sha256 | default(omit)}}"
owner: "{{ item.owner|default(omit) }}"
mode: "{{ item.mode|default(omit) }}"
- with_items: downloads
+ with_items: '{{downloads}}'
- name: uploads items
gc_storage:
@@ -21,4 +21,4 @@
permission: public-read
gs_access_key: "changeme"
gs_secret_key: "changeme"
- with_items: downloads
+ with_items: '{{downloads}}'
--
GitLab