Merge pull request #32 from puppetlabs/0.2.0

0.2.0

Author: davejrt

CHANGELOG.md

@@ -1,3 +1,8 @@
+#Version 0.2.0
+Supports Kubernetes up to 1.9.x
+Adds support for cri-containerd runtime
+Provides additional os and runtime switches for Kubetool
+
 #Version 0.1.3
 Provide cli switches for kubetool, and add Dockerfile
 
@@ -8,6 +13,6 @@ Supports Kubernetes up to 1.8.x
 Hotfix for kubeproxy
 
 # Version 0.1.0
-First release 
+First release
 Supports Kubernetes 1.6 - 1.7.5
 

README.md

@@ -33,10 +33,10 @@ The included configuration tool `kube_tools` auto generates all the security par
 1. cfssl is a requirement, so we recommend you install the module on a local machine and not a Puppet server by running this command:
 
 ```puppet
-puppet module install puppetlabs-kubernetes --version 0.1.3
+puppet module install puppetlabs-kubernetes --version 0.2.0
 ```
 
-2. Install cfssl. See Cloudflare's [cfssl documentation](https://github.com/cloudflare/cfssl). 
+2. Install cfssl. See Cloudflare's [cfssl documentation](https://github.com/cloudflare/cfssl).
 
 3. Change directory into the root of the module, and run the `bundle install` command.
 
@@ -75,7 +75,7 @@ The parameters are:
 
 * `OS`: the os kubernetes will run on.
 * `VERSION`: the version of kubernetes you want to deploy
-* `CONTAINER_RUNTIME`: the container runtime kubernetes will use, this can only be set to `docker` or `cri_containerd` 
+* `CONTAINER_RUNTIME`: the container runtime kubernetes will use, this can only be set to `docker` or `cri_containerd`
 * `FQDN`: the cluster fqdn.
 * `BOOTSTRAP_CONTROLLER_IP`: the ip address of the controller puppet will use to create things like cluster role bindings, kube dns, and the Kubernetes dashboard.
 * `ETCD_INITIAL_CLUSTER`: the server addresses. When in production, include three, five, or seven nodes for etcd.
@@ -174,6 +174,12 @@ The version of kube DNS to install.
 
 Defaults to `1.14.2`.
 
+#### `container_runtime`
+
+Choose between docker or cri_containerd
+
+Defaults to docker
+
 #### `controller`
 
 Specifies whether to set the node as a Kubernetes controller.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-kubernetes",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "author": "Puppet",
   "summary": "The module installs and configures a Kubernetes cluster",
   "license": "Apache-2.0",
@@ -11,8 +11,8 @@
     {"name":"puppetlabs-stdlib","version_requirement":">= 4.19.0 < 5.0.0"},
     {"name":"puppetlabs-apt","version_requirement":">= 4.1.0 < 4.3.0"},
     {"name":"stahnma-epel","version_requirement":">= 1.2.2 < 1.3.0"},
-    {"name":"puppet-archive","version_requirement":">= 2.0.0 < 2.1.0"},    
-    {"name":"maestrodev-wget"}
+    {"name":"puppet-archive","version_requirement":">= 2.0.0 < 2.1.0"},
+    {"name":"maestrodev-wget","version_requirement":">= 1.0.0"}
   ],
   "data_provider": null,
   "operatingsystem_support": [