diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 3caecf3af6bc532ad70b64ab7eedf8e47fad7ccd..685bc57cd12f73681a01578996180909513b4c4e 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1 +1 @@ -docker_version: 1.9 +docker_version: 1.10 diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml index 9a116a636d745a74e3684c227045554d91f51bdb..87bd8834cf4d7e621c4723f30b480ac55b048d64 100644 --- a/roles/docker/vars/debian.yml +++ b/roles/docker/vars/debian.yml @@ -4,7 +4,7 @@ docker_kernel_min_version: '3.2' docker_versioned_pkg: latest: docker-engine 1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }} - 1.10: docker-engine=1.10.1-0~{{ ansible_distribution_release|lower }} + 1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index 98eef396061ed6d49137276f1c9729ceb5839d42..0f8ca9d9623192ab63af0e2e83df011431918418 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -5,7 +5,7 @@ docker_kernel_min_version: '3.2' docker_versioned_pkg: latest: docker-engine 1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }} - 1.10: docker-engine=1.10.1-0~{{ ansible_distribution_release|lower }} + 1.10: docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index f915a84f6f657bd7d3713d138ff883960c2c27ca..5cac568d9efa0bce5e46bf7d9ef60235405dad7f 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -32,7 +32,7 @@ dns_domain: "{{ cluster_name }}" kube_proxy_mode: userspace hyperkube_image_repo: quay.io/ant31/kubernetes-hyperkube -hyperkube_image_tag: v1.1.8 +hyperkube_image_tag: v1.2.0 # IP address of the DNS server. # Kubernetes will create a pod with several containers, serving as the DNS @@ -41,6 +41,6 @@ hyperkube_image_tag: v1.1.8 # pick the 10th ip address in the kube_service_addresses range and use that. dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(253)|ipaddr('address') }}" -kube_api_runtime_config: - - extensions/v1beta1/daemonsets=true - - extensions/v1beta1/deployments=true +# kube_api_runtime_config: +# - extensions/v1beta1/daemonsets=true +# - extensions/v1beta1/deployments=true