diff --git a/roles/container-engine/containerd-common/vars/ubuntu-16.yml b/roles/container-engine/containerd-common/vars/ubuntu-16.yml deleted file mode 100644 index 2832884e526..00000000000 --- a/roles/container-engine/containerd-common/vars/ubuntu-16.yml +++ /dev/null @@ -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" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 2e9b7749438..37428e043ab 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -447,14 +447,18 @@ nerdctl_archive_checksums: amd64: 0.12.1: 868dc5997c3edb0bd06f75012e71c2b15ee0885b83bad191fbe2a1d6d5f4f2ac +# TODO(cristicalin): remove compatibility entries once debian9 and ubuntu16 jobs are dropped or docker is dropped containerd_archive_checksums: arm: + latest: 0 # this is needed to make debian9 and ubuntu16 CI jobs happy 1.4.9: 0 1.5.5: 0 arm64: + latest: 0 # this is needed to make debian9 and ubuntu16 CI jobs happy 1.4.9: 0 1.5.5: 0 amd64: + latest: 0 # this is needed to make debian9 and ubuntu16 CI jobs happy 1.4.9: 346f88ad5b973960ff81b5539d4177af5941ec2e4703b479ca9a6081ff1d023b 1.5.5: 8efc527ffb772a82021800f0151374a3113ed2439922497ff08f2596a70f10f1 diff --git a/tests/files/packet_debian9-calico-upgrade-once.yml b/tests/files/packet_debian9-calico-upgrade-once.yml index f0d5a80f4ad..9e4fa1b553c 100644 --- a/tests/files/packet_debian9-calico-upgrade-once.yml +++ b/tests/files/packet_debian9-calico-upgrade-once.yml @@ -8,3 +8,6 @@ kube_network_plugin: calico deploy_netchecker: true dns_min_replicas: 1 download_run_once: true + +# Make docker happy +containerd_version: latest diff --git a/tests/files/packet_debian9-calico-upgrade.yml b/tests/files/packet_debian9-calico-upgrade.yml index ca5ef121622..dd02770246f 100644 --- a/tests/files/packet_debian9-calico-upgrade.yml +++ b/tests/files/packet_debian9-calico-upgrade.yml @@ -7,3 +7,6 @@ mode: default kube_network_plugin: calico deploy_netchecker: true dns_min_replicas: 1 + +# Make docker happy +containerd_version: latest diff --git a/tests/files/packet_debian9-macvlan.yml b/tests/files/packet_debian9-macvlan.yml index 7a80202f650..9a481b2b939 100644 --- a/tests/files/packet_debian9-macvlan.yml +++ b/tests/files/packet_debian9-macvlan.yml @@ -12,3 +12,6 @@ kube_proxy_masquerade_all: true macvlan_interface: "eth0" auto_renew_certificates: true + +# Make docker happy +containerd_version: latest diff --git a/tests/files/packet_fedora34-kube-ovn-containerd.yml b/tests/files/packet_fedora34-kube-ovn-containerd.yml index 77d1a711dc9..f3a26624597 100644 --- a/tests/files/packet_fedora34-kube-ovn-containerd.yml +++ b/tests/files/packet_fedora34-kube-ovn-containerd.yml @@ -5,7 +5,6 @@ mode: default # Kubespray settings container_manager: containerd -containerd_version: latest etcd_deployment_type: host deploy_netchecker: true dns_min_replicas: 1 diff --git a/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml b/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml index 94261c50b7a..9861b350210 100644 --- a/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml +++ b/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml @@ -9,5 +9,5 @@ kube_network_plugin: canal deploy_netchecker: true dns_min_replicas: 1 -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest diff --git a/tests/files/packet_ubuntu16-canal-sep.yml b/tests/files/packet_ubuntu16-canal-sep.yml index d4bfc053592..44df4f948cc 100644 --- a/tests/files/packet_ubuntu16-canal-sep.yml +++ b/tests/files/packet_ubuntu16-canal-sep.yml @@ -9,5 +9,5 @@ kube_network_plugin: canal deploy_netchecker: true dns_min_replicas: 1 -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest diff --git a/tests/files/packet_ubuntu16-flannel-ha.yml b/tests/files/packet_ubuntu16-flannel-ha.yml index 7c6160922e8..5f3b19d9bec 100644 --- a/tests/files/packet_ubuntu16-flannel-ha.yml +++ b/tests/files/packet_ubuntu16-flannel-ha.yml @@ -11,5 +11,5 @@ skip_non_kubeadm_warning: true deploy_netchecker: true dns_min_replicas: 1 -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest diff --git a/tests/files/packet_ubuntu16-kube-router-sep.yml b/tests/files/packet_ubuntu16-kube-router-sep.yml index 5ec5767562c..e923834aa4e 100644 --- a/tests/files/packet_ubuntu16-kube-router-sep.yml +++ b/tests/files/packet_ubuntu16-kube-router-sep.yml @@ -9,5 +9,5 @@ kube_network_plugin: kube-router deploy_netchecker: true dns_min_replicas: 1 -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest diff --git a/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml b/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml index 97ea810d17f..043639ad9e1 100644 --- a/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml +++ b/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml @@ -11,5 +11,5 @@ dns_min_replicas: 1 kube_router_run_service_proxy: true -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest diff --git a/tests/files/packet_ubuntu16-weave-sep.yml b/tests/files/packet_ubuntu16-weave-sep.yml index b06c75e8719..e424a6cc847 100644 --- a/tests/files/packet_ubuntu16-weave-sep.yml +++ b/tests/files/packet_ubuntu16-weave-sep.yml @@ -10,5 +10,5 @@ dns_min_replicas: 1 auto_renew_certificates: true -# Ubuntu 16 packages for containerd are limited to 1.4.6 -containerd_version: 1.4.6 +# Make docker jobs happy +containerd_version: latest