External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-02 17:28:59 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update docker default to 19.03 - cleanup docker docs & refs (#6153)

Browse Source
This commit is contained in:
Florian Ruynat
2020-05-28 09:52:02 +02:00
committed by GitHub
parent 83d945127f
commit 6179405e84
8 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/container-engine/docker/defaults/main.yml
View File

@@ -1,5 +1,5 @@
---
docker_version: '18.09'
docker_version: '19.03'
docker_cli_version: "{{ 'latest' if docker_version != 'latest' and docker_version is version('18.09', '<') else docker_version }}"
docker_selinux_version: '17.03'

8
roles/container-engine/docker/vars/debian.yml
View File

@@ -11,10 +11,10 @@ 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.2~ce~3-0~debian
'18.09': docker-ce=5:18.09.7~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.7~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:18.09.7~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.7~3-0~debian-{{ ansible_distribution_release|lower }}
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.9~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.9~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.9~3-0~debian-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

8
roles/container-engine/docker/vars/fedora.yml
View File

@@ -9,17 +9,15 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.8-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.9-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.9-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.9-3.fc{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-19.03.8-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.9-3.fc{{ ansible_distribution_major_version }}
# Fedora 30/31 don't provide packages for docker 18.0x ...
docker_version: "19.03"
docker_cli_version: "19.03"
docker_package_info:
pkg_mgr: dnf
pkgs:

6
roles/container-engine/docker/vars/redhat.yml
View File

@@ -12,9 +12,9 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.3.ce-3.el7
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.8-3.el7
'stable': docker-ce-18.09.9-3.el7
'edge': docker-ce-19.03.8-3.el7
'19.03': docker-ce-19.03.9-3.el7
'stable': docker-ce-19.03.9-3.el7
'edge': docker-ce-19.03.9-3.el7
docker_cli_versioned_pkg:
'latest': docker-ce-cli

8
roles/container-engine/docker/vars/ubuntu-amd64.yml
View File

@@ -11,10 +11,10 @@ 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.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

8
roles/container-engine/docker/vars/ubuntu-arm64.yml
View File

@@ -7,10 +7,10 @@ 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.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

5
roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md
View File

@@ -45,9 +45,9 @@ There are cloud provider specific yaml files.
Kubernetes is available in Docker for Mac (from [version 18.06.0-ce](https://docs.docker.com/docker-for-mac/release-notes/#stable-releases-of-2018))
[enable]: https://docs.docker.com/docker-for-mac/#kubernetes
First you need to [enable kubernetes](https://docs.docker.com/docker-for-mac/#kubernetes).
Create a service
Then you have to create a service:
```console
kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/cloud-generic.yaml
@@ -60,7 +60,6 @@ For standard usage:
```console
minikube addons enable ingress
```
For development:
1. Disable the ingress addon: