mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-01 01:28:11 -03:30
containerd: download containerd from upstream instead of using distro specific packages (#7970)
* Containerd: download containerd from upstream instead of using distro specific packages split runc download to separate role make bootstrap-os role deploy container-selinux and seccomp libraries clean up package manager provided containerd move variables to docker role that are no longer common with containerd * Containerd: make molecule testing more relevant * replace ubuntu18 with ubuntu20 * add centos8 and debian11 to molecule tests * run kubernetes/preinstall role to ensure relevancy of test including dependency packages * CI: adjust test scenarios for downloaded containerd
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
---
|
||||
# We keep these variables around to allow migration from package
|
||||
# manager controlled installs to direct download ones.
|
||||
containerd_package: 'containerd.io'
|
||||
yum_repo_dir: /etc/yum.repos.d
|
||||
|
||||
# Keep minimal repo information arround for cleanup
|
||||
containerd_repo_info:
|
||||
repos:
|
||||
|
||||
# Fedora docker-ce repo
|
||||
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ ansible_distribution_major_version }}/$basearch/stable'
|
||||
docker_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg'
|
||||
# CentOS/RedHat docker-ce repo
|
||||
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/{{ ansible_distribution_major_version }}/$basearch/stable'
|
||||
docker_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
|
||||
# Ubuntu docker-ce repo
|
||||
docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
|
||||
docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
|
||||
docker_ubuntu_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
|
||||
containerd_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
|
||||
containerd_ubuntu_repo_component: "stable"
|
||||
|
||||
# Debian docker-ce repo
|
||||
docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
|
||||
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
||||
docker_debian_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
|
||||
containerd_debian_repo_base_url: "https://download.docker.com/linux/debian"
|
||||
containerd_debian_repo_component: "stable"
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
---
|
||||
- name: gather os specific variables
|
||||
- name: containerd-common | check if fedora coreos
|
||||
stat:
|
||||
path: /run/ostree-booted
|
||||
get_attributes: no
|
||||
get_checksum: no
|
||||
get_mime: no
|
||||
register: ostree
|
||||
|
||||
- name: containerd-common | set is_ostree
|
||||
set_fact:
|
||||
is_ostree: "{{ ostree.stat.exists }}"
|
||||
|
||||
- name: containerd-common | gather os specific variables
|
||||
include_vars: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
|
||||
@@ -1,10 +1,2 @@
|
||||
---
|
||||
containerd_package: containerd
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.2': "{{ containerd_package }}-1.3.2-1.amzn{{ ansible_distribution_major_version }}"
|
||||
'1.4.1': "{{ containerd_package }}-1.4.1-2.amzn{{ ansible_distribution_major_version }}"
|
||||
'1.4.4': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}"
|
||||
'1.4.6': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
|
||||
'stable': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
|
||||
'edge': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
---
|
||||
containerd_version: 1.4.3
|
||||
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}=1.3.7-1"
|
||||
'1.3.9': "{{ containerd_package }}=1.3.9-1"
|
||||
'1.4.3': "{{ containerd_package }}=1.4.3-1"
|
||||
'stable': "{{ containerd_package }}=1.4.3-1"
|
||||
'edge': "{{ containerd_package }}=1.4.3-1"
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}=1.3.7-1"
|
||||
'1.3.9': "{{ containerd_package }}=1.3.9-1"
|
||||
'1.4.3': "{{ containerd_package }}=1.4.3-2"
|
||||
'1.4.4': "{{ containerd_package }}=1.4.4-1"
|
||||
'1.4.6': "{{ containerd_package }}=1.4.6-1"
|
||||
'1.4.9': "{{ containerd_package }}=1.4.9-1"
|
||||
'stable': "{{ containerd_package }}=1.4.9-1"
|
||||
'edge': "{{ containerd_package }}=1.4.9-1"
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}-1.3.7-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.fc{{ ansible_distribution_major_version }}"
|
||||
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'1.4.6': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'stable': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
'edge': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}-1.3.7-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.el{{ ansible_distribution_major_version }}"
|
||||
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'1.4.6': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'stable': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
|
||||
'edge': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
|
||||
2
roles/container-engine/containerd-common/vars/suse.yml
Normal file
2
roles/container-engine/containerd-common/vars/suse.yml
Normal file
@@ -0,0 +1,2 @@
|
||||
---
|
||||
containerd_package: containerd
|
||||
@@ -1,10 +0,0 @@
|
||||
---
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}=1.3.7-1"
|
||||
'1.3.9': "{{ containerd_package }}=1.3.9-1"
|
||||
'1.4.3': "{{ containerd_package }}=1.4.3-2"
|
||||
'1.4.4': "{{ containerd_package }}=1.4.4-1"
|
||||
'1.4.6': "{{ containerd_package }}=1.4.6-1"
|
||||
'stable': "{{ containerd_package }}=1.4.6-1"
|
||||
'edge': "{{ containerd_package }}=1.4.6-1"
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
containerd_versioned_pkg:
|
||||
'latest': "{{ containerd_package }}"
|
||||
'1.3.7': "{{ containerd_package }}=1.3.7-1"
|
||||
'1.3.9': "{{ containerd_package }}=1.3.9-1"
|
||||
'1.4.3': "{{ containerd_package }}=1.4.3-2"
|
||||
'1.4.4': "{{ containerd_package }}=1.4.4-1"
|
||||
'1.4.6': "{{ containerd_package }}=1.4.6-1"
|
||||
'1.4.9': "{{ containerd_package }}=1.4.9-1"
|
||||
'stable': "{{ containerd_package }}=1.4.9-1"
|
||||
'edge': "{{ containerd_package }}=1.4.9-1"
|
||||
Reference in New Issue
Block a user