Update etcd to 3.2.24

Use GCS buckets instead of GitHub releases

Signed-off-by: Christian Simon <simon@swine.de>

Author: simonswine

CHANGELOG.md

@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 | Kubernetes  | `>= 1.7 && < 1.11` | `1.10.6` |
 | Calico      |                    | `3.1.1`  |
 | Vault Helper|                    | `0.9.13` |
-| Etcd        |                    | `3.2.17` |
+| Etcd        |                    | `3.2.24` |
 
 
 ## [0.4.1]: 0.4.1 - 2018-08-24

puppet/modules/etcd/manifests/params.pp

@@ -5,11 +5,11 @@
   $group = 'etcd'
   $uid = 873
   $gid = 873
-  $version = '3.2.17'
+  $version = '3.2.24'
   $bin_dir = '/opt/bin'
   $dest_dir = '/opt'
   $config_dir = '/etc/etcd'
   $data_dir = '/var/lib/etcd'
   $download_dir = '/tmp'
-  $download_url = 'https://github.com/coreos/etcd/releases/download/v#VERSION#/etcd-v#VERSION#-linux-amd64.tar.gz'
+  $download_url = 'https://storage.googleapis.com/etcd/v#VERSION#/etcd-v#VERSION#-linux-amd64.tar.gz'
 }

puppet/modules/etcd/spec/acceptance/single_node_spec.rb

@@ -9,19 +9,19 @@
 $advertise_client_network = '10.0.0.0/8'
 
 etcd::instance{'k8s-main':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   advertise_client_network => $advertise_client_network,
 }
 
 etcd::instance{'k8s-events':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   client_port              => 2389,
   peer_port                => 2390,
   advertise_client_network => $advertise_client_network,
 }
 
 etcd::instance{'k8s-overlay':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   client_port              => 2399,
   peer_port                => 2400,
   advertise_client_network => $advertise_client_network,
@@ -35,7 +35,7 @@
 
       [2379, 2389, 2399].each do |port|
         it "test etcd on port #{port} on host #{host.name}" do
-				result = host.shell "ETCDCTL=http://127.0.0.1:#{port} /opt/etcd-3.2.17/etcdctl cluster-health"
+				result = host.shell "ETCDCTL=http://127.0.0.1:#{port} /opt/etcd-3.2.24/etcdctl cluster-health"
         end
       end
     end

puppet/modules/etcd/spec/acceptance/three_node_spec.rb

@@ -22,15 +22,15 @@
 $advertise_client_network = '10.123.0.0/16'
 
 etcd::instance{'k8s-main':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   nodename                 => $::hostname,
   members                  => $members,
   initial_cluster          => $initial_cluster,
   advertise_client_network => $advertise_client_network,
 }
 
 etcd::instance{'k8s-events':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   nodename                 => $::hostname,
   members                  => $members,
   initial_cluster          => $initial_cluster,
@@ -40,7 +40,7 @@
 }
 
 etcd::instance{'k8s-overlay':
-  version                  => '3.2.17',
+  version                  => '3.2.24',
   nodename                 => $::hostname,
   members                  => $members,
   initial_cluster          => $initial_cluster,
@@ -71,7 +71,7 @@
       [2379, 2389, 2399].each do |port|
         hosts_as('etcd').each do |host|
           it "test etcd on port #{port} on host #{host.name}" do
-            result = host.shell "ETCDCTL=http://127.0.0.1:#{port} /opt/etcd-3.2.17/etcdctl cluster-health"
+            result = host.shell "ETCDCTL=http://127.0.0.1:#{port} /opt/etcd-3.2.24/etcdctl cluster-health"
           end
         end
       end

puppet/modules/kubernetes/files/etcd.service

@@ -4,8 +4,8 @@ After=network.target
 
 [Service]
 Type=notify
-Environment=ETCD_VER=v3.2.17
-Environment=DOWNLOAD_URL=https://github.com/coreos/etcd/releases/download
+Environment=ETCD_VER=v3.2.24
+Environment=DOWNLOAD_URL=https://storage.googleapis.com/etcd
 ExecStartPre=/bin/bash -c 'test -x /tmp/test-etcd/etcd || curl -sL ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz && mkdir -p /tmp/test-etcd && tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/test-etcd --strip-components=1'
 ExecStart=/tmp/test-etcd/etcd
 LimitNOFILE=65536

puppet/modules/tarmak/manifests/init.pp

@@ -57,15 +57,15 @@
   Integer[1,65535] $etcd_overlay_client_port = 2359,
   Integer[1,65535] $etcd_overlay_peer_port = 2360,
   String $etcd_overlay_ca_name = 'etcd-overlay',
-  String $etcd_overlay_version = '3.2.17',
+  String $etcd_overlay_version = '3.2.24',
   Integer[1,65535] $etcd_k8s_main_client_port = 2379,
   Integer[1,65535] $etcd_k8s_main_peer_port = 2380,
   String $etcd_k8s_main_ca_name = 'etcd-k8s',
-  String $etcd_k8s_main_version = '3.2.17',
+  String $etcd_k8s_main_version = '3.2.24',
   Integer[1,65535] $etcd_k8s_events_client_port = 2369,
   Integer[1,65535] $etcd_k8s_events_peer_port = 2370,
   String $etcd_k8s_events_ca_name = 'etcd-k8s',
-  String $etcd_k8s_events_version = '3.2.17',
+  String $etcd_k8s_events_version = '3.2.24',
   Optional[String] $etcd_mount_unit = undef,
   Enum['aws', ''] $cloud_provider = '',
   String $helper_path = $tarmak::params::helper_path,

terraform/amazon/modules/bastion/templates/bastion_user_data.yaml

@@ -20,8 +20,8 @@ write_files:
     After=network.target
 
     [Service]
-    Environment=ETCD_VERSION=3.2.17
-    Environment=ETCD_HASH=0a75e794502e2e76417b19da2807a9915fa58dcbf0985e397741d570f4f305cd
+    Environment=ETCD_VERSION=3.2.24
+    Environment=ETCD_HASH=947849dbcfa13927c81236fb76a7c01d587bbab42ab1e807184cd91b026ebed7
     Environment=ETCD_DATA_DIR=/var/lib/etcd
     PermissionsStartOnly=true
     Restart=on-failure
@@ -30,7 +30,7 @@ write_files:
       set -e ;\
       test -x /opt/etcd-$${ETCD_VERSION}/etcd && exit 0 ;\
       mkdir -p /opt/etcd-$${ETCD_VERSION} ;\
-      curl -sLo /opt/etcd-$${ETCD_VERSION}/etcd.tar.gz https://github.com/coreos/etcd/releases/download/v$${ETCD_VERSION}/etcd-v$${ETCD_VERSION}-linux-amd64.tar.gz ;\
+      curl -sLo /opt/etcd-$${ETCD_VERSION}/etcd.tar.gz https://storage.googleapis.com/etcd/v$${ETCD_VERSION}/etcd-v$${ETCD_VERSION}-linux-amd64.tar.gz ;\
       echo "$${ETCD_HASH}  /opt/etcd-$${ETCD_VERSION}/etcd.tar.gz" | sha256sum -c ;\
       tar xvf /opt/etcd-$${ETCD_VERSION}/etcd.tar.gz -C /opt/etcd-$${ETCD_VERSION}/ --strip-components 1'
     ExecStartPre=/bin/sh -c '\