From 40fbb3691d94fa9afaf1519cc65ee29b8634f219 Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Sat, 2 Jul 2016 10:33:58 +0200
Subject: [PATCH] uprade to etcd v3.0.1

---
 roles/download/defaults/main.yml |  4 ++--
 roles/etcd/defaults/main.yml     |  2 +-
 roles/uploads/defaults/main.yml  |  4 ++--
 roles/uploads/tasks/main.yml     | 18 ------------------
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 5128e8f3e..6501a1e1b 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -7,7 +7,7 @@ download_run_once: False
 # Versions
 include_vars: kube_versions.yml
 
-etcd_version: v2.3.7
+etcd_version: v3.0.1
 calico_version: v0.20.0
 calico_cni_version: v1.3.1
 weave_version: v1.5.0
@@ -28,7 +28,7 @@ calico_checksum: "0d1d15c03ea53cc1a16f2faf02626ed8951829ece410a36fdb93e5a19fbab6
 calico_cni_checksum: "ac05cb9254b5aaa5822cf10325983431bd25489147f2edf9dec7e43d99c43e77"
 calico_cni_ipam_checksum: "3df6951a30749c279229e7e318e74ac4e41263996125be65257db7cd25097273"
 weave_checksum: "28d2c4e2b1ad8600da69882501eba697679aea10a5e61c769aa3a9ee72b0d89a"
-etcd_checksum: "ab102d271026a4060c9f85ecad11f454d82b1df7b8e676cc3da69f67eb078729"
+etcd_checksum: "7e5d8db2b8a7cec7a93e531c8ae0f3108c66c7d896a2fb6d8768c067923ce0aa"
 
 downloads:
   calico:
diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml
index 8e80bfcc8..e599619ca 100644
--- a/roles/etcd/defaults/main.yml
+++ b/roles/etcd/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-etcd_version: v2.3.7
+etcd_version: v3.0.1
 etcd_bin_dir: "{{ local_release_dir }}/etcd/etcd-{{ etcd_version }}-linux-amd64/"
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index a8f1002e2..563d96b34 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -4,7 +4,7 @@ local_release_dir: /tmp
 # Versions
 include_vars: kube_versions.yml
 
-etcd_version: v2.3.7
+etcd_version: v3.0.1
 calico_version: v0.20.0
 calico_cni_version: v1.3.1
 weave_version: v1.5.0
@@ -22,7 +22,7 @@ calico_checksum: "0d1d15c03ea53cc1a16f2faf02626ed8951829ece410a36fdb93e5a19fbab6
 calico_cni_checksum: "ac05cb9254b5aaa5822cf10325983431bd25489147f2edf9dec7e43d99c43e77"
 calico_cni_ipam_checksum: "3df6951a30749c279229e7e318e74ac4e41263996125be65257db7cd25097273"
 weave_checksum: "28d2c4e2b1ad8600da69882501eba697679aea10a5e61c769aa3a9ee72b0d89a"
-etcd_checksum: "ab102d271026a4060c9f85ecad11f454d82b1df7b8e676cc3da69f67eb078729"
+etcd_checksum: "7e5d8db2b8a7cec7a93e531c8ae0f3108c66c7d896a2fb6d8768c067923ce0aa"
 
 downloads:
   - name: calico
diff --git a/roles/uploads/tasks/main.yml b/roles/uploads/tasks/main.yml
index b19c2aa93..fcd32beef 100644
--- a/roles/uploads/tasks/main.yml
+++ b/roles/uploads/tasks/main.yml
@@ -1,24 +1,6 @@
 ---
 - include_vars: "kube_versions.yml"
 
-- name: Create the checksum file
-  lineinfile:
-    create: yes
-    dest: "{{ role_path }}/{{ kube_version }}_k8s-sha256"
-    line: '{{item.name}}:{{item.sha256}}'
-  with_items: '{{downloads}}'
-  when: item.name in ["kubernetes-kubelet", "kubernetes-kubectl", "kubernetes-apiserver"]
-
-- name: Upload checksum file on GS
-  gc_storage:
-    bucket: kargo
-    object: "{{ kube_version }}_k8s-sha256"
-    src: "{{ role_path }}/{{ kube_version }}_k8s-sha256"
-    mode: put
-    permission: public-read
-    gs_access_key: "changeme"
-    gs_secret_key: "changeme"
-
 - name: Create dest directories
   file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes
   with_items: '{{downloads}}'