kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to docker 1.10.3

pull/176/head
Antoine Legrand 2016-03-17 10:22:52 +01:00 committed by Smaine Kahlouch
parent 15ce66b2f5
commit 785b84fd43
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/defaults/main.yml
View File

@ -1 +1 @@
docker_version: 1.9 docker_version: 1.10

2
roles/docker/vars/debian.yml
View File

@ -4,7 +4,7 @@ docker_kernel_min_version: '3.2'
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine latest: docker-engine
1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }} 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: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

2
roles/docker/vars/ubuntu.yml
View File

@ -5,7 +5,7 @@ docker_kernel_min_version: '3.2'
docker_versioned_pkg: docker_versioned_pkg:
latest: docker-engine latest: docker-engine
1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }} 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: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

8
roles/kubernetes/node/defaults/main.yml
View File

@ -32,7 +32,7 @@ dns_domain: "{{ cluster_name }}"
kube_proxy_mode: userspace kube_proxy_mode: userspace
hyperkube_image_repo: quay.io/ant31/kubernetes-hyperkube 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. # IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS # 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. # 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') }}" dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(253)|ipaddr('address') }}"
kube_api_runtime_config: # kube_api_runtime_config:
- extensions/v1beta1/daemonsets=true # - extensions/v1beta1/daemonsets=true
- extensions/v1beta1/deployments=true # - extensions/v1beta1/deployments=true