[CI] ensure upgrade tests cover defaults (containerd currently)

docs/ci.md

@@ -8,7 +8,7 @@ To generate this Matrix run `./tests/scripts/md-table/main.py`
 |---| --- | --- | --- | --- | --- | --- | --- | --- |
 almalinux8 |  :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
 amazon |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 |  :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: |
+centos7 |  :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
 debian10 |  :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: |
@@ -46,7 +46,7 @@ ubuntu22 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 |---| --- | --- | --- | --- | --- | --- | --- | --- |
 almalinux8 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 amazon |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
+centos7 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian10 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |

tests/files/packet_centos7-docker-weave-upgrade-ha.yml

@@ -7,10 +7,5 @@ mode: ha
 kube_network_plugin: weave
 kubernetes_audit: true
 
-# Docker specific settings:
-container_manager: docker
-etcd_deployment_type: docker
-resolvconf_mode: docker_dns
-
 # Needed to upgrade from 1.16 to 1.17, otherwise upgrade is partial and bug followed
 upgrade_cluster_setup: true

tests/files/packet_debian10-calico-upgrade-once.yml

@@ -6,13 +6,6 @@ mode: default
 # Kubespray settings
 download_run_once: true
 
-# Docker specific settings:
-container_manager: docker
-etcd_deployment_type: docker
-
-# Make docker happy
-docker_containerd_version: latest
-
 # Pin disabling ipip mode to ensure proper upgrade
 ipip: false
 calico_vxlan_mode: Always

tests/files/packet_debian10-calico-upgrade.yml

@@ -3,10 +3,6 @@
 cloud_image: debian-10
 mode: default
 
-# Docker specific settings:
-container_manager: docker
-etcd_deployment_type: docker
-
 # Pin disabling ipip mode to ensure proper upgrade
 ipip: false
 calico_vxlan_mode: Always