Browse Source

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>
pull/12322/head
ChengHao Yang 3 months ago
committed by GitHub
parent
commit
3cda93405a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
34 changed files with 82 additions and 103 deletions
  1. 33
      .gitlab-ci/kubevirt.yml
  2. 2
      README.md
  3. 6
      docs/developers/ci.md
  4. 4
      roles/adduser/molecule/default/molecule.yml
  5. 2
      roles/bastion-ssh-config/molecule/default/molecule.yml
  6. 8
      roles/bootstrap_os/molecule/default/molecule.yml
  7. 4
      roles/container-engine/containerd/molecule/default/molecule.yml
  8. 4
      roles/container-engine/cri-dockerd/molecule/default/molecule.yml
  9. 4
      roles/container-engine/gvisor/molecule/default/molecule.yml
  10. 8
      roles/container-engine/kata-containers/molecule/default/molecule.yml
  11. 4
      roles/container-engine/youki/molecule/default/molecule.yml
  12. 16
      tests/files/ubuntu20-all-in-one-docker.yml
  13. 11
      tests/files/ubuntu20-calico-all-in-one.yml
  14. 8
      tests/files/ubuntu20-flannel-collection.yml
  15. 1
      tests/files/ubuntu20-flannel.yml
  16. 7
      tests/files/ubuntu20-kube-router-sep.yml
  17. 10
      tests/files/ubuntu20-kube-router-svc-proxy.yml
  18. 0
      tests/files/ubuntu24-calico-all-in-one
  19. 4
      tests/files/ubuntu24-calico-all-in-one-hardening.yml
  20. 0
      tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha
  21. 2
      tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha.yml
  22. 2
      tests/files/ubuntu24-calico-etcd-kubeadm.yml
  23. 0
      tests/files/ubuntu24-calico-ha-recover
  24. 0
      tests/files/ubuntu24-calico-ha-recover-noquorum
  25. 2
      tests/files/ubuntu24-calico-ha-recover-noquorum.yml
  26. 2
      tests/files/ubuntu24-calico-ha-recover.yml
  27. 2
      tests/files/ubuntu24-calico-ha-wireguard.yml
  28. 2
      tests/files/ubuntu24-cilium-sep.yml
  29. 8
      tests/files/ubuntu24-flannel-collection.yml
  30. 2
      tests/files/ubuntu24-flannel-ha-once.yml
  31. 2
      tests/files/ubuntu24-flannel-ha.yml
  32. 8
      tests/files/ubuntu24-flannel.yml
  33. 7
      tests/files/ubuntu24-kube-router-sep.yml
  34. 10
      tests/files/ubuntu24-kube-router-svc-proxy.yml

33
.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

2
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))

6
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: |

4
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:

2
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:

8
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

4
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:

4
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:

4
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:

8
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:

4
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:

16
tests/files/ubuntu20-all-in-one-docker.yml

@ -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

11
tests/files/ubuntu20-calico-all-in-one.yml

@ -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

8
tests/files/ubuntu20-flannel-collection.yml

@ -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

1
tests/files/ubuntu20-flannel.yml

@ -1 +0,0 @@
ubuntu20-flannel-collection.yml

7
tests/files/ubuntu20-kube-router-sep.yml

@ -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"

10
tests/files/ubuntu20-kube-router-svc-proxy.yml

@ -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

tests/files/ubuntu20-calico-all-in-one → tests/files/ubuntu24-calico-all-in-one

tests/files/ubuntu20-calico-all-in-one-hardening.yml → 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

tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha → tests/files/ubuntu24-calico-etcd-kubeadm-upgrade-ha

tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml → 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

tests/files/ubuntu20-calico-etcd-kubeadm.yml → 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

tests/files/ubuntu20-calico-ha-recover → tests/files/ubuntu24-calico-ha-recover

tests/files/ubuntu20-calico-ha-recover-noquorum → tests/files/ubuntu24-calico-ha-recover-noquorum

tests/files/ubuntu20-calico-ha-recover-noquorum.yml → 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

tests/files/ubuntu20-calico-ha-recover.yml → tests/files/ubuntu24-calico-ha-recover.yml

@ -1,4 +1,4 @@
---
# Instance settings
cloud_image: ubuntu-2004
cloud_image: ubuntu-2404
mode: ha-recover

tests/files/ubuntu20-calico-ha-wireguard.yml → 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

tests/files/ubuntu20-cilium-sep.yml → tests/files/ubuntu24-cilium-sep.yml

@ -1,6 +1,6 @@
---
# Instance settings
cloud_image: ubuntu-2004
cloud_image: ubuntu-2404
mode: separate
# Kubespray settings

8
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

tests/files/ubuntu20-flannel-ha-once.yml → 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

tests/files/ubuntu20-flannel-ha.yml → tests/files/ubuntu24-flannel-ha.yml

@ -1,6 +1,6 @@
---
# Instance settings
cloud_image: ubuntu-2004
cloud_image: ubuntu-2404
mode: ha
# Kubespray settings

8
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

7
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"

10
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
Loading…
Cancel
Save