Browse Source

Add docker 18.09 support (#3844)

pull/3846/head
Rong Zhang 6 years ago
committed by Kubernetes Prow Robot
parent
commit
1550c05a7a
6 changed files with 6 additions and 1 deletions
  1. 2
      README.md
  2. 1
      roles/container-engine/docker/vars/debian.yml
  3. 1
      roles/container-engine/docker/vars/redhat.yml
  4. 1
      roles/container-engine/docker/vars/ubuntu-amd64.yml
  5. 1
      roles/container-engine/docker/vars/ubuntu-arm64.yml
  6. 1
      roles/container-engine/docker/vars/ubuntu-bionic.yml

2
README.md

@ -131,7 +131,7 @@ Supported Components
- [coredns](https://github.com/coredns/coredns) v1.2.6
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.21.0
Note: The list of validated [docker versions](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.12.md) was updated to 1.11.1, 1.12.1, 1.13.1, 17.03, 17.06, 17.09, 18.06. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).
Note: The list of validated [docker versions](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md) was updated to 1.11.1, 1.12.1, 1.13.1, 17.03, 17.06, 17.09, 18.06. kubeadm now properly recognizes Docker 18.09.0 and newer, but still treats 18.06 as the default supported version. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).
Note 2: rkt support as docker alternative is limited to control plane (etcd and
kubelet). Docker is still used for Kubernetes cluster workloads and network

1
roles/container-engine/docker/vars/debian.yml

@ -14,6 +14,7 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~debian
'18.03': docker-ce=18.03.1~ce-0~debian
'18.06': docker-ce=18.06.1~ce~3-0~debian
'18.09': docker-ce_18.09.0~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=18.06.1~ce~3-0~debian
'edge': docker-ce=17.12.1~ce-0~debian

1
roles/container-engine/docker/vars/redhat.yml

@ -15,6 +15,7 @@ docker_versioned_pkg:
'17.12': docker-ce-17.12.1.ce-1.el7.centos
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.1.ce-3.el7
'18.09': docker-ce-18.09.0-3.el7
'stable': docker-ce-18.06.1.ce-3.el7
'edge': docker-ce-17.12.1.ce-1.el7.centos

1
roles/container-engine/docker/vars/ubuntu-amd64.yml

@ -11,6 +11,7 @@ docker_versioned_pkg:
'17.09': docker-ce=17.09.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.1~ce~3-0~ubuntu
'18.09': docker-ce_18.09.0~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=18.06.1~ce~3-0~ubuntu
'edge': docker-ce=18.06.1~ce~3-0~ubuntu

1
roles/container-engine/docker/vars/ubuntu-arm64.yml

@ -7,6 +7,7 @@ docker_versioned_pkg:
'17.09': docker-ce=17.09.1~ce-0~ubuntu
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.1~ce~3-0~ubuntu
'18.09': docker-ce_18.09.0~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=18.06.1~ce~3-0~ubuntu
'edge': docker-ce=18.06.1~ce~3-0~ubuntu

1
roles/container-engine/docker/vars/ubuntu-bionic.yml

@ -7,6 +7,7 @@ docker_versioned_pkg:
'latest': docker-ce
'18.03': docker-ce=18.03.1~ce-3-0~ubuntu
'18.06': docker-ce=18.06.1~ce~3-0~ubuntu
'18.09': docker-ce_18.09.0~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=18.06.1~ce~3-0~ubuntu
'edge': docker-ce=18.06.1~ce~3-0~ubuntu

Loading…
Cancel
Save