Merge pull request #51 from puppetlabs/1.0.1

1.0.1

Author: davejrt

CHANGELOG.md

@@ -1,4 +1,13 @@
-$Version 1.0.0
+#Version 1.0.1
+
+Support for weave and flannel
+EPEL module removed as dependency 
+Added `$apiserver_extra_arguments` PR #47
+Added support for PDK
+Added support for stdlib 4.24.0
+Updated kubetool to include CNI information in hiera (see README)
+
+#Version 1.0.0
 Officially supported version of puppetlabs-kubernetes
 
 #Version 0.2.0

README.md

@@ -39,9 +39,8 @@ image to simplify installation and use.
 If you do not already have Docker installed on your workstation, install it [here](https://www.docker.com/community-edition)
 
 The kubetool docker image takes each of the parameters as environment variables. When run as follows it will output a `kubernetes.yaml` file in your current working directory:
-
-```puppet
-docker run --rm -v $(pwd):/mnt -e OS=debian -e VERSION=1.9.1 -e CONTAINER_RUNTIME=docker -e CNI_PROVIDER=weave -e FQDN=kubernetes -e IP=172.17.10.101 -e BOOTSTRAP_CONTROLLER_IP=172.17.10.101 -e ETCD_INITIAL_CLUSTER="etcd-kube-master=http://172.17.10.101:2380" -e ETCD_IP="%{::ipaddress_enp0s8}" -e KUBE_API_ADVERTISE_ADDRESS="%{::ipaddress_enp0s8}" -e INSTALL_DASHBOARD=true puppet/kubetool
+```
+docker run --rm -v $(pwd):/mnt -e OS=debian -e VERSION=1.9.2 -e CONTAINER_RUNTIME=docker -e CNI_PROVIDER=weave -e FQDN=kubernetes -e IP=172.17.10.101 -e BOOTSTRAP_CONTROLLER_IP=172.17.10.101 -e ETCD_INITIAL_CLUSTER="etcd-kube-master=http://172.17.10.101:2380" -e ETCD_IP="%{::ipaddress_enp0s8}" -e KUBE_API_ADVERTISE_ADDRESS="%{::ipaddress_enp0s8}" -e INSTALL_DASHBOARD=true puppet/kubetool
 ```
 
 The parameters are:
@@ -186,6 +185,9 @@ An example with hiera would be `kubernetes::kube_api_advertise_address:"%{::ipad
 
 Defaults to `undef`.
 
+#### `apiserver_extra_arguments`
+An array of extra configuration you can pass to the Kubernetes api container
+defaults to []
 #### `etcd_version`
 
 The version of etcd to use.

manifests/init.pp

@@ -50,6 +50,10 @@
 #   An example with hiera would be kubernetes::kube_api_advertise_address: "%{::ipaddress_enp0s8}"
 #   defaults to undef
 #
+# [*$apiserver_extra_arguments*]
+#   This is an array to pass extra configuration to the Kubernetes api.
+#   Defaults to []
+#
 # [*etcd_version*]
 #   The version of etcd that you would like to use.
 #   Defaults to 3.0.17

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-kubernetes",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Puppet",
   "summary": "The module installs and configures a Kubernetes cluster",
   "license": "Apache-2.0",