C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix debian docker available version (#7668)

Browse source
This commit is contained in:
Florian Ruynat 2021-06-02 05:58:39 +02:00 committed by GitHub
parent b46e751573
commit 54cda80018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/container-engine/containerd-common/vars/debian-stretch.yml
View file

@ -1,4 +1,6 @@
---
containerd_version: 1.4.3
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.3.7': "{{ containerd_package }}=1.3.7-1"

34
roles/container-engine/docker/vars/debian-stretch.yml Normal file
View file

@ -0,0 +1,34 @@
---
docker_version: 19.03
docker_cli_version: 19.03
# https://download.docker.com/linux/debian/
docker_versioned_pkg:
'latest': docker-ce
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info:
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"
docker_repo_key_info:
url: '{{ docker_debian_repo_gpgkey }}'
repo_keys:
- '{{ docker_debian_repo_repokey }}'
docker_repo_info:
repos:
- >
deb {{ docker_debian_repo_base_url }}
{{ ansible_distribution_release|lower }}
stable

4
roles/container-engine/docker/vars/debian.yml
View file

@ -5,8 +5,8 @@ docker_versioned_pkg:
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'20.10': docker-ce=5:20.10.6~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.6~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.6~3-0~debian-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

4
roles/container-engine/docker/vars/fedora.yml
View file

@ -5,8 +5,8 @@ docker_versioned_pkg:
'latest': docker-ce
'19.03': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.6-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.6-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.6-3.fc{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

4
roles/container-engine/docker/vars/redhat.yml
View file

@ -7,8 +7,8 @@ docker_versioned_pkg:
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.6-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.6-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.6-3.el{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

4
roles/container-engine/docker/vars/ubuntu.yml
View file

@ -5,8 +5,8 @@ docker_versioned_pkg:
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'20.10': docker-ce=5:20.10.6~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.6~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.6~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli

7
roles/kubespray-defaults/defaults/main.yaml
View file

@ -310,12 +310,7 @@ docker_plugins: []
etcd_kubeadm_enabled: false
# Containerd options
containerd_version: >-
{%- if ansible_os_family == "Debian" and ansible_distribution_release == "stretch" -%}
1.4.3
{%- else -%}
1.4.4
{%- endif -%}
containerd_version: 1.4.4
containerd_use_systemd_cgroup: true
# Settings for containerized control plane (etcd/kubelet/secrets)

3
tests/files/packet_debian9-calico-upgrade.yml
View file

@ -7,6 +7,3 @@ mode: default
kube_network_plugin: calico
deploy_netchecker: true
dns_min_replicas: 1
# Only docker package 19.03 for Debian9
docker_version: '19.03'