diff --git a/README.md b/README.md
index 37a8610d0d72ace90475b51682cee6a057799600..428a0aa783c5eecf66d3a5ebcb42f65bb7fd2234 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@ Deploy a Production Ready Kubernetes Cluster
If you have questions, join us on the [kubernetes slack](https://kubernetes.slack.com), channel **\#kubespray**.
-- Can be deployed on **AWS, GCE, Azure, OpenStack, vSphere or Baremetal**
-- **High available** cluster
-- **Composable** (Choice of the network plugin for instance)
-- Support most popular **Linux distributions**
-- **Continuous integration tests**
+- Can be deployed on **AWS, GCE, Azure, OpenStack, vSphere or Baremetal**
+- **High available** cluster
+- **Composable** (Choice of the network plugin for instance)
+- Support most popular **Linux distributions**
+- **Continuous integration tests**
Quick Start
-----------
@@ -17,6 +17,7 @@ Quick Start
To deploy the cluster you can use :
### Ansible
+
# Install dependencies from ``requirements.txt``
sudo pip install -r requirements.txt
@@ -36,19 +37,16 @@ To deploy the cluster you can use :
### Vagrant
- For Vagrant we need to install python dependencies for provisioning tasks.\
- Check if Python and pip are installed:
-```sh
-python -v && pip -v
-```
-
- If this returns the version of the software, you're good to go. If not, download and install Python from here https://www.python.org/downloads/source/
- Install the necessary requirements
-
-```sh
-sudo pip install -r requirements.txt
-vagrant up
-```
+For Vagrant we need to install python dependencies for provisioning tasks.
+Check if Python and pip are installed:
+
+ python -v && pip -v
+
+If this returns the version of the software, you're good to go. If not, download and install Python from here <https://www.python.org/downloads/source/>
+Install the necessary requirements
+
+ sudo pip install -r requirements.txt
+ vagrant up
Documents
---------
@@ -91,8 +89,8 @@ Note: Upstart/SysV init based OS types are not supported.
Versions of supported components
--------------------------------
-- [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.10.2
-- [etcd](https://github.com/coreos/etcd/releases) v3.2.16
+- [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.10.4
+- [etcd](https://github.com/coreos/etcd/releases) v3.2.18
- [flanneld](https://github.com/coreos/flannel/releases) v0.10.0
- [calico](https://docs.projectcalico.org/v2.6/releases/) v2.6.8
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
@@ -135,7 +133,7 @@ You can choose between 6 network plugins. (default: `calico`, except Vagrant use
- [canal](https://github.com/projectcalico/canal): a composition of calico and flannel plugins.
-- [cilium](http://docs.cilium.io/en/latest/): layer 3/4 networking (as well as layer 7 to protect and secure application protocols), supports dynamic insertion of BPF bytecode into the Linux kernel to implement security services, networking and visibility logic.
+- [cilium](http://docs.cilium.io/en/latest/): layer 3/4 networking (as well as layer 7 to protect and secure application protocols), supports dynamic insertion of BPF bytecode into the Linux kernel to implement security services, networking and visibility logic.
- [contiv](docs/contiv.md): supports vlan, vxlan, bgp and Cisco SDN networking. This plugin is able to
apply firewall policies, segregate containers in multiple network and bridging pods onto physical networks.
diff --git a/inventory/sample/group_vars/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster.yml
index 52a9a207964ea5c9d27701abfc2153827b6a812d..babdc732acb11e91c08a7a326fef600dcd7023f3 100644
--- a/inventory/sample/group_vars/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster.yml
@@ -19,7 +19,7 @@ kube_users_dir: "{{ kube_config_dir }}/users"
kube_api_anonymous_auth: true
## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.10.2
+kube_version: v1.10.4
# Where the binaries will be downloaded.
# Note: ensure that you've enough disk space (about 1G)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 286a3ec4c5d29a85e76ff1c04f78d482bfd1780b..e999db535857e9cca50376ebe9c055bded0c66ae 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -24,9 +24,9 @@ download_always_pull: False
download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube-master'][0]}}{% endif %}"
# Versions
-kube_version: v1.10.2
+kube_version: v1.10.4
kubeadm_version: "{{ kube_version }}"
-etcd_version: v3.2.16
+etcd_version: v3.2.18
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
calico_version: "v2.6.8"
@@ -50,7 +50,7 @@ vault_download_url: "https://releases.hashicorp.com/vault/{{ vault_version }}/va
# Checksums
istioctl_checksum: fd703063c540b8c0ab943f478c05ab257d88ae27224c746a27d0526ddbf7c370
-kubeadm_checksum: 394d7d340214c91d669186cf4f2110d8eb840ca965399b4d8b22d0545a60e377
+kubeadm_checksum: 7e1169bbbeed973ab402941672dec957638dea5952a1e8bc89a37d5e709cc4b4
vault_binary_checksum: 3c4d70ba71619a43229e65c67830e30e050eab7a81ac6b28325ff707e5914188
# Containers
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index adeb84dc67532666f1a9f3e7c2f475930805fa53..61fb62a0962df882424d4b006a95fe2399f7507d 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -14,7 +14,7 @@ is_atomic: false
## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.10.2
+kube_version: v1.10.4
## Kube Proxy mode One of ['iptables','ipvs']
kube_proxy_mode: iptables