Merge pull request #3200 from pablodav/feature/k8s_win_v1.11

Required support to start working on windows node support
This commit is contained in:
k8s-ci-robot
2018-09-03 04:51:23 -07:00
committed by GitHub
19 changed files with 85 additions and 1 deletions

View File

@@ -138,6 +138,15 @@
msg: "{{available_packages}}"
when: docker_task_result|failed
# This is required to ensure any apt upgrade will not break kubernetes
- name: Set docker pin priority to apt_preferences on Debian family
template:
src: "apt_preferences.d/debian_docker.j2"
dest: "/etc/apt/preferences.d/docker"
owner: "root"
mode: 0644
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic)
- name: ensure service is started if docker packages are already present
service:
name: docker

View File

@@ -0,0 +1,3 @@
Package: docker-ce
Pin: version {{ docker_version }}.*
Pin-Priority: 1001