From 3cda93405a97e7b0acad0681976fd18cfb2a201f Mon Sep 17 00:00:00 2001 From: ChengHao Yang <17496418+tico88612@users.noreply.github.com> Date: Fri, 20 Jun 2025 09:54:51 +0800 Subject: [PATCH] Cleanup: Ubuntu 20.04 tests (#12301) * Test: molecule replace ubuntu2004 with ubuntu2204 ubuntu2404 cri-dockerd, adduser and bastion-ssh-config can't run ubuntu2404, maybe needs to check login. "System is booting up. Unprivileged users are not permitted to log in yet. Please come back later. For technical details, see pam_nologin(8)." Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> * Test: replace ubuntu-2004 with ubuntu-2404 All ubuntu-2004 tests are removed. Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> * Docs: update ci.md Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> * Docs: update README.md Remove Ubuntu 20.04 support Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> --------- Signed-off-by: ChengHao Yang Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> --- .gitlab-ci/kubevirt.yml | 33 +++++++++---------- README.md | 2 +- docs/developers/ci.md | 6 ++-- roles/adduser/molecule/default/molecule.yml | 4 +-- .../molecule/default/molecule.yml | 2 +- .../molecule/default/molecule.yml | 8 ++--- .../containerd/molecule/default/molecule.yml | 4 +-- .../cri-dockerd/molecule/default/molecule.yml | 4 +-- .../gvisor/molecule/default/molecule.yml | 4 +-- .../molecule/default/molecule.yml | 8 ++--- .../youki/molecule/default/molecule.yml | 4 +-- tests/files/ubuntu20-all-in-one-docker.yml | 16 --------- tests/files/ubuntu20-calico-all-in-one.yml | 11 ------- tests/files/ubuntu20-flannel-collection.yml | 8 ----- tests/files/ubuntu20-flannel.yml | 1 - tests/files/ubuntu20-kube-router-sep.yml | 7 ---- .../files/ubuntu20-kube-router-svc-proxy.yml | 10 ------ ...-all-in-one => ubuntu24-calico-all-in-one} | 0 ... ubuntu24-calico-all-in-one-hardening.yml} | 4 +-- ...> ubuntu24-calico-etcd-kubeadm-upgrade-ha} | 0 ...untu24-calico-etcd-kubeadm-upgrade-ha.yml} | 2 +- ...m.yml => ubuntu24-calico-etcd-kubeadm.yml} | 2 +- ...-ha-recover => ubuntu24-calico-ha-recover} | 0 ...um => ubuntu24-calico-ha-recover-noquorum} | 0 ...> ubuntu24-calico-ha-recover-noquorum.yml} | 2 +- ...ver.yml => ubuntu24-calico-ha-recover.yml} | 2 +- ...d.yml => ubuntu24-calico-ha-wireguard.yml} | 2 +- ...cilium-sep.yml => ubuntu24-cilium-sep.yml} | 2 +- tests/files/ubuntu24-flannel-collection.yml | 8 +++++ ...-once.yml => ubuntu24-flannel-ha-once.yml} | 2 +- ...flannel-ha.yml => ubuntu24-flannel-ha.yml} | 2 +- tests/files/ubuntu24-flannel.yml | 8 +++++ tests/files/ubuntu24-kube-router-sep.yml | 7 ++++ .../files/ubuntu24-kube-router-svc-proxy.yml | 10 ++++++ 34 files changed, 82 insertions(+), 103 deletions(-) delete mode 100644 tests/files/ubuntu20-all-in-one-docker.yml delete mode 100644 tests/files/ubuntu20-calico-all-in-one.yml delete mode 100644 tests/files/ubuntu20-flannel-collection.yml delete mode 120000 tests/files/ubuntu20-flannel.yml delete mode 100644 tests/files/ubuntu20-kube-router-sep.yml delete mode 100644 tests/files/ubuntu20-kube-router-svc-proxy.yml rename tests/files/{ubuntu20-calico-all-in-one => ubuntu24-calico-all-in-one} (100%) rename tests/files/{ubuntu20-calico-all-in-one-hardening.yml => ubuntu24-calico-all-in-one-hardening.yml} (97%) rename tests/files/{ubuntu20-calico-etcd-kubeadm-upgrade-ha => ubuntu24-calico-etcd-kubeadm-upgrade-ha} (100%) rename tests/files/{ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml => ubuntu24-calico-etcd-kubeadm-upgrade-ha.yml} (96%) rename tests/files/{ubuntu20-calico-etcd-kubeadm.yml => ubuntu24-calico-etcd-kubeadm.yml} (93%) rename tests/files/{ubuntu20-calico-ha-recover => ubuntu24-calico-ha-recover} (100%) rename tests/files/{ubuntu20-calico-ha-recover-noquorum => ubuntu24-calico-ha-recover-noquorum} (100%) rename tests/files/{ubuntu20-calico-ha-recover-noquorum.yml => ubuntu24-calico-ha-recover-noquorum.yml} (66%) rename tests/files/{ubuntu20-calico-ha-recover.yml => ubuntu24-calico-ha-recover.yml} (62%) rename tests/files/{ubuntu20-calico-ha-wireguard.yml => ubuntu24-calico-ha-wireguard.yml} (94%) rename tests/files/{ubuntu20-cilium-sep.yml => ubuntu24-cilium-sep.yml} (86%) create mode 100644 tests/files/ubuntu24-flannel-collection.yml rename tests/files/{ubuntu20-flannel-ha-once.yml => ubuntu24-flannel-ha-once.yml} (95%) rename tests/files/{ubuntu20-flannel-ha.yml => ubuntu24-flannel-ha.yml} (91%) create mode 100644 tests/files/ubuntu24-flannel.yml create mode 100644 tests/files/ubuntu24-kube-router-sep.yml create mode 100644 tests/files/ubuntu24-kube-router-svc-proxy.yml diff --git a/.gitlab-ci/kubevirt.yml b/.gitlab-ci/kubevirt.yml index 0caadfd0c..62401894c 100644 --- a/.gitlab-ci/kubevirt.yml +++ b/.gitlab-ci/kubevirt.yml @@ -46,23 +46,23 @@ pr: - opensuse15-6-calico - rockylinux8-calico - rockylinux9-cilium - - ubuntu20-calico-all-in-one-hardening - - ubuntu20-cilium-sep - - ubuntu20-flannel-collection - - ubuntu20-kube-router-sep - - ubuntu20-kube-router-svc-proxy - ubuntu22-calico-all-in-one - ubuntu22-calico-all-in-one-upgrade - ubuntu24-calico-etcd-datastore + - ubuntu24-calico-all-in-one-hardening + - ubuntu24-cilium-sep + - ubuntu24-flannel-collection + - ubuntu24-kube-router-sep + - ubuntu24-kube-router-svc-proxy - ubuntu24-ha-separate-etcd - flatcar4081-calico -# The ubuntu20-calico-all-in-one jobs are meant as early stages to prevent running the full CI if something is horribly broken -ubuntu20-calico-all-in-one: +# The ubuntu24-calico-all-in-one jobs are meant as early stages to prevent running the full CI if something is horribly broken +ubuntu24-calico-all-in-one: stage: deploy-part1 extends: .kubevirt variables: - TESTCASE: ubuntu20-calico-all-in-one + TESTCASE: ubuntu24-calico-all-in-one rules: - if: $CI_COMMIT_BRANCH =~ /^pr-.*$/ when: on_success @@ -92,10 +92,9 @@ pr_full: - debian12-custom-cni-helm - fedora39-calico-swap-selinux - fedora39-crio - - ubuntu20-all-in-one-docker - - ubuntu20-calico-ha-wireguard - - ubuntu20-flannel-ha - - ubuntu20-flannel-ha-once + - ubuntu24-calico-ha-wireguard + - ubuntu24-flannel-ha + - ubuntu24-flannel-ha-once # Need an update of the container image to use schema v2 # update: quay.io/kubespray/vm-amazon-linux-2:latest @@ -130,11 +129,11 @@ pr_extended: - debian12-docker - opensuse15-6-docker-cilium - rockylinux9-calico - - ubuntu20-calico-etcd-kubeadm - - ubuntu20-flannel - ubuntu22-all-in-one-docker - ubuntu24-all-in-one-docker - ubuntu24-calico-all-in-one + - ubuntu24-calico-etcd-kubeadm + - ubuntu24-flannel # TODO: migrate to pr-full, fix the broken ones periodic: @@ -151,6 +150,6 @@ periodic: - debian12-cilium-svc-proxy - fedora39-calico-selinux - fedora40-docker-calico - - ubuntu20-calico-etcd-kubeadm-upgrade-ha - - ubuntu20-calico-ha-recover - - ubuntu20-calico-ha-recover-noquorum + - ubuntu24-calico-etcd-kubeadm-upgrade-ha + - ubuntu24-calico-ha-recover + - ubuntu24-calico-ha-recover-noquorum diff --git a/README.md b/README.md index 527a09761..4a0ecbd3b 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ vagrant up - **Flatcar Container Linux by Kinvolk** - **Debian** Bookworm, Bullseye -- **Ubuntu** 20.04, 22.04, 24.04 +- **Ubuntu** 22.04, 24.04 - **CentOS/RHEL** [8, 9](docs/operating_systems/rhel.md#rhel-8) - **Fedora** 39, 40 - **Fedora CoreOS** (see [fcos Note](docs/operating_systems/fcos.md)) diff --git a/docs/developers/ci.md b/docs/developers/ci.md index b002afa99..83341e5d7 100644 --- a/docs/developers/ci.md +++ b/docs/developers/ci.md @@ -18,9 +18,9 @@ openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | opensuse15 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | +ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | ## crio @@ -58,6 +58,6 @@ openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | opensuse15 | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/roles/adduser/molecule/default/molecule.yml b/roles/adduser/molecule/default/molecule.yml index a2043268f..8f697909e 100644 --- a/roles/adduser/molecule/default/molecule.yml +++ b/roles/adduser/molecule/default/molecule.yml @@ -3,8 +3,8 @@ role_name_check: 1 dependency: name: galaxy platforms: - - name: ubuntu20 - cloud_image: ubuntu-2004 + - name: ubuntu22 + cloud_image: ubuntu-2204 vm_cpu_cores: 1 vm_memory: 512 provisioner: diff --git a/roles/bastion-ssh-config/molecule/default/molecule.yml b/roles/bastion-ssh-config/molecule/default/molecule.yml index 5a515626d..ea3692597 100644 --- a/roles/bastion-ssh-config/molecule/default/molecule.yml +++ b/roles/bastion-ssh-config/molecule/default/molecule.yml @@ -4,7 +4,7 @@ dependency: name: galaxy platforms: - name: bastion-01 - cloud_image: ubuntu-2004 + cloud_image: ubuntu-2204 vm_cpu_cores: 1 vm_memory: 512 provisioner: diff --git a/roles/bootstrap_os/molecule/default/molecule.yml b/roles/bootstrap_os/molecule/default/molecule.yml index bdb3d85a8..df969f4f7 100644 --- a/roles/bootstrap_os/molecule/default/molecule.yml +++ b/roles/bootstrap_os/molecule/default/molecule.yml @@ -3,14 +3,14 @@ role_name_check: 1 dependency: name: galaxy platforms: - - name: ubuntu20 - cloud_image: ubuntu-2004 - vm_cpu_cores: 1 - vm_memory: 512 - name: ubuntu22 cloud_image: ubuntu-2204 vm_cpu_cores: 1 vm_memory: 512 + - name: ubuntu24 + cloud_image: ubuntu-2404 + vm_cpu_cores: 1 + vm_memory: 512 - name: almalinux9 cloud_image: almalinux-9 vm_cpu_cores: 1 diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml index 9b473b7bd..8a7a56e26 100644 --- a/roles/container-engine/containerd/molecule/default/molecule.yml +++ b/roles/container-engine/containerd/molecule/default/molecule.yml @@ -1,8 +1,8 @@ --- role_name_check: 1 platforms: - - cloud_image: ubuntu-2004 - name: ubuntu20 + - cloud_image: ubuntu-2404 + name: ubuntu24 vm_cpu_cores: 1 vm_memory: 1024 node_groups: diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml index 20ef396b5..787023764 100644 --- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml +++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml @@ -7,8 +7,8 @@ platforms: vm_memory: 1024 node_groups: - kube_control_plane - - name: ubuntu20 - cloud_image: ubuntu-2004 + - name: ubuntu22 + cloud_image: ubuntu-2204 vm_cpu_cores: 1 vm_memory: 1024 node_groups: diff --git a/roles/container-engine/gvisor/molecule/default/molecule.yml b/roles/container-engine/gvisor/molecule/default/molecule.yml index 212da4a91..f73a9775c 100644 --- a/roles/container-engine/gvisor/molecule/default/molecule.yml +++ b/roles/container-engine/gvisor/molecule/default/molecule.yml @@ -1,8 +1,8 @@ --- role_name_check: 1 platforms: - - cloud_image: ubuntu-2004 - name: ubuntu20 + - cloud_image: ubuntu-2404 + name: ubuntu24 vm_cpu_cores: 1 vm_memory: 1024 node_groups: diff --git a/roles/container-engine/kata-containers/molecule/default/molecule.yml b/roles/container-engine/kata-containers/molecule/default/molecule.yml index 0acb8f3a6..6e6e1c7cb 100644 --- a/roles/container-engine/kata-containers/molecule/default/molecule.yml +++ b/roles/container-engine/kata-containers/molecule/default/molecule.yml @@ -1,14 +1,14 @@ --- role_name_check: 1 platforms: - - name: ubuntu20 - cloud_image: ubuntu-2004 + - name: ubuntu22 + cloud_image: ubuntu-2204 vm_cpu_cores: 1 vm_memory: 1024 node_groups: - kube_control_plane - - name: ubuntu22 - cloud_image: ubuntu-2204 + - name: ubuntu24 + cloud_image: ubuntu-2404 vm_cpu_cores: 1 vm_memory: 1024 node_groups: diff --git a/roles/container-engine/youki/molecule/default/molecule.yml b/roles/container-engine/youki/molecule/default/molecule.yml index 212da4a91..f73a9775c 100644 --- a/roles/container-engine/youki/molecule/default/molecule.yml +++ b/roles/container-engine/youki/molecule/default/molecule.yml @@ -1,8 +1,8 @@ --- role_name_check: 1 platforms: - - cloud_image: ubuntu-2004 - name: ubuntu20 + - cloud_image: ubuntu-2404 + name: ubuntu24 vm_cpu_cores: 1 vm_memory: 1024 node_groups: diff --git a/tests/files/ubuntu20-all-in-one-docker.yml b/tests/files/ubuntu20-all-in-one-docker.yml deleted file mode 100644 index 0116eae42..000000000 --- a/tests/files/ubuntu20-all-in-one-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-2004 -mode: all-in-one - -# Kubespray settings -auto_renew_certificates: true - -# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=focal&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko -kube_proxy_mode: iptables -enable_nodelocaldns: false - -# Use docker -container_manager: docker -etcd_deployment_type: docker -resolvconf_mode: docker_dns diff --git a/tests/files/ubuntu20-calico-all-in-one.yml b/tests/files/ubuntu20-calico-all-in-one.yml deleted file mode 100644 index f59e72a3c..000000000 --- a/tests/files/ubuntu20-calico-all-in-one.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-2004 -mode: all-in-one - -# Kubespray settings -auto_renew_certificates: true - -# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=focal&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko -kube_proxy_mode: iptables -enable_nodelocaldns: false diff --git a/tests/files/ubuntu20-flannel-collection.yml b/tests/files/ubuntu20-flannel-collection.yml deleted file mode 100644 index b5d0ba57b..000000000 --- a/tests/files/ubuntu20-flannel-collection.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -cloud_image: ubuntu-2004 -cluster_layout: - - node_groups: ['kube_control_plane', 'etcd', 'kube_node'] - - node_groups: ['kube_control_plane', 'etcd', 'kube_node'] - - node_groups: ['etcd', 'kube_node'] - -kube_network_plugin: flannel diff --git a/tests/files/ubuntu20-flannel.yml b/tests/files/ubuntu20-flannel.yml deleted file mode 120000 index ba939279e..000000000 --- a/tests/files/ubuntu20-flannel.yml +++ /dev/null @@ -1 +0,0 @@ -ubuntu20-flannel-collection.yml \ No newline at end of file diff --git a/tests/files/ubuntu20-kube-router-sep.yml b/tests/files/ubuntu20-kube-router-sep.yml deleted file mode 100644 index ca34c88a6..000000000 --- a/tests/files/ubuntu20-kube-router-sep.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -cloud_image: ubuntu-2004 -cluster_layout: - - node_groups: ['kube_control_plane', 'etcd', 'kube_node'] - - node_groups: ['kube_node'] - -kube_network_plugin: "kube-router" diff --git a/tests/files/ubuntu20-kube-router-svc-proxy.yml b/tests/files/ubuntu20-kube-router-svc-proxy.yml deleted file mode 100644 index b2739b793..000000000 --- a/tests/files/ubuntu20-kube-router-svc-proxy.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -cloud_image: ubuntu-2004 -cluster_layout: - - node_groups: ['kube_control_plane', 'etcd', 'kube_node'] - - node_groups: ['kube_control_plane', 'etcd', 'kube_node'] - - node_groups: ['etcd', 'kube_node'] - -kube_network_plugin: "kube-router" - -kube_router_run_service_proxy: true diff --git a/tests/files/ubuntu20-calico-all-in-one b/tests/files/ubuntu24-calico-all-in-one similarity index 100% rename from tests/files/ubuntu20-calico-all-in-one rename to tests/files/ubuntu24-calico-all-in-one diff --git a/tests/files/ubuntu20-calico-all-in-one-hardening.yml b/tests/files/ubuntu24-calico-all-in-one-hardening.yml similarity index 97% rename from tests/files/ubuntu20-calico-all-in-one-hardening.yml rename to tests/files/ubuntu24-calico-all-in-one-hardening.yml index b684c1f25..024f320d3 100644 --- a/tests/files/ubuntu20-calico-all-in-one-hardening.yml +++ b/tests/files/ubuntu24-calico-all-in-one-hardening.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: all-in-one # Kubespray settings @@ -12,7 +12,7 @@ enable_nodelocaldns: false # The followings are for hardening ## kube-apiserver -authorization_modes: ['Node', 'RBAC'] +authorization_modes: ["Node", "RBAC"] kube_apiserver_request_timeout: 120s kube_apiserver_service_account_lookup: true diff --git a/tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha b/tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha similarity index 100% rename from tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha rename to tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha diff --git a/tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml b/tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha.yml similarity index 96% rename from tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml rename to tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha.yml index 425ce75b8..2b2e6df34 100644 --- a/tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml +++ b/tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha # use the kubeadm etcd setting to test the upgrade diff --git a/tests/files/ubuntu20-calico-etcd-kubeadm.yml b/tests/files/ubuntu24-calico-etcd-kubeadm.yml similarity index 93% rename from tests/files/ubuntu20-calico-etcd-kubeadm.yml rename to tests/files/ubuntu24-calico-etcd-kubeadm.yml index 62e94105d..57e33976a 100644 --- a/tests/files/ubuntu20-calico-etcd-kubeadm.yml +++ b/tests/files/ubuntu24-calico-etcd-kubeadm.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 # use the kubeadm etcd setting to test the upgrade etcd_deployment_type: kubeadm diff --git a/tests/files/ubuntu20-calico-ha-recover b/tests/files/ubuntu24-calico-ha-recover similarity index 100% rename from tests/files/ubuntu20-calico-ha-recover rename to tests/files/ubuntu24-calico-ha-recover diff --git a/tests/files/ubuntu20-calico-ha-recover-noquorum b/tests/files/ubuntu24-calico-ha-recover-noquorum similarity index 100% rename from tests/files/ubuntu20-calico-ha-recover-noquorum rename to tests/files/ubuntu24-calico-ha-recover-noquorum diff --git a/tests/files/ubuntu20-calico-ha-recover-noquorum.yml b/tests/files/ubuntu24-calico-ha-recover-noquorum.yml similarity index 66% rename from tests/files/ubuntu20-calico-ha-recover-noquorum.yml rename to tests/files/ubuntu24-calico-ha-recover-noquorum.yml index 2d6db360e..037491f58 100644 --- a/tests/files/ubuntu20-calico-ha-recover-noquorum.yml +++ b/tests/files/ubuntu24-calico-ha-recover-noquorum.yml @@ -1,4 +1,4 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha-recover-noquorum diff --git a/tests/files/ubuntu20-calico-ha-recover.yml b/tests/files/ubuntu24-calico-ha-recover.yml similarity index 62% rename from tests/files/ubuntu20-calico-ha-recover.yml rename to tests/files/ubuntu24-calico-ha-recover.yml index a757719ad..bdb58f0c0 100644 --- a/tests/files/ubuntu20-calico-ha-recover.yml +++ b/tests/files/ubuntu24-calico-ha-recover.yml @@ -1,4 +1,4 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha-recover diff --git a/tests/files/ubuntu20-calico-ha-wireguard.yml b/tests/files/ubuntu24-calico-ha-wireguard.yml similarity index 94% rename from tests/files/ubuntu20-calico-ha-wireguard.yml rename to tests/files/ubuntu24-calico-ha-wireguard.yml index f2e2f57d0..4b27cdaa2 100644 --- a/tests/files/ubuntu20-calico-ha-wireguard.yml +++ b/tests/files/ubuntu24-calico-ha-wireguard.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha # Kubespray settings diff --git a/tests/files/ubuntu20-cilium-sep.yml b/tests/files/ubuntu24-cilium-sep.yml similarity index 86% rename from tests/files/ubuntu20-cilium-sep.yml rename to tests/files/ubuntu24-cilium-sep.yml index 3089c1899..f53482dd1 100644 --- a/tests/files/ubuntu20-cilium-sep.yml +++ b/tests/files/ubuntu24-cilium-sep.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: separate # Kubespray settings diff --git a/tests/files/ubuntu24-flannel-collection.yml b/tests/files/ubuntu24-flannel-collection.yml new file mode 100644 index 000000000..cbd11cdc9 --- /dev/null +++ b/tests/files/ubuntu24-flannel-collection.yml @@ -0,0 +1,8 @@ +--- +cloud_image: ubuntu-2404 +cluster_layout: + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["etcd", "kube_node"] + +kube_network_plugin: flannel diff --git a/tests/files/ubuntu20-flannel-ha-once.yml b/tests/files/ubuntu24-flannel-ha-once.yml similarity index 95% rename from tests/files/ubuntu20-flannel-ha-once.yml rename to tests/files/ubuntu24-flannel-ha-once.yml index 211d03ee1..d91a91705 100644 --- a/tests/files/ubuntu20-flannel-ha-once.yml +++ b/tests/files/ubuntu24-flannel-ha-once.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha # Kubespray settings diff --git a/tests/files/ubuntu20-flannel-ha.yml b/tests/files/ubuntu24-flannel-ha.yml similarity index 91% rename from tests/files/ubuntu20-flannel-ha.yml rename to tests/files/ubuntu24-flannel-ha.yml index cec99f934..a5cf93d83 100644 --- a/tests/files/ubuntu20-flannel-ha.yml +++ b/tests/files/ubuntu24-flannel-ha.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-2004 +cloud_image: ubuntu-2404 mode: ha # Kubespray settings diff --git a/tests/files/ubuntu24-flannel.yml b/tests/files/ubuntu24-flannel.yml new file mode 100644 index 000000000..cbd11cdc9 --- /dev/null +++ b/tests/files/ubuntu24-flannel.yml @@ -0,0 +1,8 @@ +--- +cloud_image: ubuntu-2404 +cluster_layout: + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["etcd", "kube_node"] + +kube_network_plugin: flannel diff --git a/tests/files/ubuntu24-kube-router-sep.yml b/tests/files/ubuntu24-kube-router-sep.yml new file mode 100644 index 000000000..2e5efcce2 --- /dev/null +++ b/tests/files/ubuntu24-kube-router-sep.yml @@ -0,0 +1,7 @@ +--- +cloud_image: ubuntu-2404 +cluster_layout: + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["kube_node"] + +kube_network_plugin: "kube-router" diff --git a/tests/files/ubuntu24-kube-router-svc-proxy.yml b/tests/files/ubuntu24-kube-router-svc-proxy.yml new file mode 100644 index 000000000..d3b6746cd --- /dev/null +++ b/tests/files/ubuntu24-kube-router-svc-proxy.yml @@ -0,0 +1,10 @@ +--- +cloud_image: ubuntu-2404 +cluster_layout: + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["kube_control_plane", "etcd", "kube_node"] + - node_groups: ["etcd", "kube_node"] + +kube_network_plugin: "kube-router" + +kube_router_run_service_proxy: true