Merge pull request #514 from simonswine/update-etcd-3.2.24

Update etcd 3.2.24

Author: jetstack-bot

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/calico/README.md

@@ -57,6 +57,11 @@ calico init.pp
 * Type: `String`
 * Default: `'kube-system'`
 
+##### `pod_network`
+
+* Type: `Optional[String]`
+* Default: `undef`
+
 ##### `mtu`
 
 * Type: `Integer[1000,65535]`
@@ -72,13 +77,34 @@ calico init.pp
 
 This class disable the source/destination check on AWS instances
 
+#### Parameters
+
+##### `image`
+
+* Type: `String`
+* Default: `'ottoyiu/k8s-ec2-srcdst'`
+
+##### `version`
+
+* Type: `String`
+* Default: `'0.1.0'`
+
 
 ### `calico::node`
 
+Calico Node
 
+Calico Node contains a Daemon Set that spinsup the overlay network on every
+workern node.
 
 #### Parameters
 
+##### `metrics_port`
+
+* Port for felix metrics endpoint, 0 disables metrics collection
+* Type: `Integer[0,65535]`
+* Default: `9091`
+
 ##### `node_image`
 
 * Type: `String`
@@ -87,7 +113,7 @@ This class disable the source/destination check on AWS instances
 ##### `node_version`
 
 * Type: `String`
-* Default: `'2.5.1'`
+* Default: `'3.1.1'`
 
 ##### `cni_image`
 
@@ -97,12 +123,7 @@ This class disable the source/destination check on AWS instances
 ##### `cni_version`
 
 * Type: `String`
-* Default: `'1.10.0'`
-
-##### `ipv4_pool_cidr`
-
-* Type: `String`
-* Default: `'10.231.0.0/16'`
+* Default: `'3.1.1'`
 
 ##### `ipv4_pool_ipip_mode`
 
@@ -124,9 +145,9 @@ calico params.pp
 ##### `image`
 
 * Type: `String`
-* Default: `'quay.io/calico/kube-policy-controller'`
+* Default: `'quay.io/calico/kube-controllers'`
 
 ##### `version`
 
 * Type: `String`
-* Default: `'0.7.0'`
+* Default: `'3.1.1'`

…ppet/modules/prometheus/.yardoc/complete puppet/modules/consul/README.mdpuppet/modules/prometheus/.yardoc/complete renamed to puppet/modules/consul/README.md puppet/modules/prometheus/.yardoc/complete renamed to puppet/modules/consul/README.md

@@ -6,9 +6,7 @@
 2. [Classes](#classes)
 3. [Defined Types](#defined-types)
 ## Description
-This module is part of [Tarmak](http://docs.tarmak.io) and should currently be considered alpha.
-
-[![Travis](https://img.shields.io/travis/jetstack/puppet-module-etcd.svg)](https://travis-ci.org/jetstack/puppet-module-etcd/)
+Install/configure an etcd node.
 
 ## Classes
 
@@ -128,6 +126,26 @@ etcd variable defaults
 * Type: `String`
 * Default: `nil`
 
+##### `systemd_wants`
+
+* Type: `Array[String]`
+* Default: `[]`
+
+##### `systemd_requires`
+
+* Type: `Array[String]`
+* Default: `[]`
+
+##### `systemd_after`
+
+* Type: `Array[String]`
+* Default: `[]`
+
+##### `systemd_before`
+
+* Type: `Array[String]`
+* Default: `[]`
+
 ##### `initial_cluster`
 
 * Type: `Array`

puppet/modules/etcd/README.md

@@ -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/manifests/params.pp

@@ -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/single_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