From d9cf380ce099ebb3a4a67b355224900b5eb00b44 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Wed, 11 Dec 2024 17:00:59 +0100 Subject: [PATCH 1/2] Remove testfiles which are not used in the CI. To reproduce this commit run in bash: for file in $(ls tests/files/) do if ! grep -Rq ${file%.*} .gitlab.ci; then rm tests/files/${file} fi done This also means that our CI matrix was not accurate. --- docs/developers/ci.md | 93 +++++++++---------- ...acket_centos8-calico-ha-once-localhost.yml | 18 ---- tests/files/packet_centos8-calico-ha.yml | 13 --- .../packet_centos8-flannel-addons-ha.yml | 74 --------------- tests/files/packet_centos8-multus-calico.yml | 7 -- .../files/packet_centos8-weave-upgrade-ha.yml | 11 --- .../packet_ubuntu20-docker-weave-sep.yml | 16 ---- tests/files/vagrant_centos8-kube-router.rb | 15 --- tests/files/vagrant_centos8-kube-router.yml | 8 -- tests/files/vagrant_ubuntu20-weave-medium.rb | 7 -- tests/files/vagrant_ubuntu20-weave-medium.yml | 3 - 11 files changed, 45 insertions(+), 220 deletions(-) delete mode 100644 tests/files/packet_centos8-calico-ha-once-localhost.yml delete mode 100644 tests/files/packet_centos8-calico-ha.yml delete mode 100644 tests/files/packet_centos8-flannel-addons-ha.yml delete mode 100644 tests/files/packet_centos8-multus-calico.yml delete mode 100644 tests/files/packet_centos8-weave-upgrade-ha.yml delete mode 100644 tests/files/packet_ubuntu20-docker-weave-sep.yml delete mode 100644 tests/files/vagrant_centos8-kube-router.rb delete mode 100644 tests/files/vagrant_centos8-kube-router.yml delete mode 100644 tests/files/vagrant_ubuntu20-weave-medium.rb delete mode 100644 tests/files/vagrant_ubuntu20-weave-medium.yml diff --git a/docs/developers/ci.md b/docs/developers/ci.md index fd458d3b657..13ee3ac6994 100644 --- a/docs/developers/ci.md +++ b/docs/developers/ci.md @@ -4,57 +4,54 @@ To generate this Matrix run `./tests/scripts/md-table/main.py` ## containerd -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | -amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos8 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | -debian11 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | -debian12 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | -fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | -ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | +|---| --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | +amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | +debian12 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | +fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | +fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +opensuse | :x: | :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: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ## crio -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian12 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | +|---| --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian12 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +opensuse | :x: | :x: | :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: | +ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## docker -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | weave | -|---| --- | --- | --- | --- | --- | --- | --- | --- | -almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | -ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | +|---| --- | --- | --- | --- | --- | --- | --- | +almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora39 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +opensuse | :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: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/tests/files/packet_centos8-calico-ha-once-localhost.yml b/tests/files/packet_centos8-calico-ha-once-localhost.yml deleted file mode 100644 index 62272c678d9..00000000000 --- a/tests/files/packet_centos8-calico-ha-once-localhost.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: ha - -# Kubespray settings -download_localhost: true -download_run_once: true -typha_enabled: true -calico_apiserver_enabled: true -calico_backend: kdd -typha_secure: true -disable_ipv6_dns: true -auto_renew_certificates: true - -# Docker settings -container_manager: docker -etcd_deployment_type: docker diff --git a/tests/files/packet_centos8-calico-ha.yml b/tests/files/packet_centos8-calico-ha.yml deleted file mode 100644 index 33049bfdd1a..00000000000 --- a/tests/files/packet_centos8-calico-ha.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: ha - -# Kubespray settings -download_localhost: false -download_run_once: true -typha_enabled: true -calico_apiserver_enabled: true -calico_backend: kdd -typha_secure: true -auto_renew_certificates: true diff --git a/tests/files/packet_centos8-flannel-addons-ha.yml b/tests/files/packet_centos8-flannel-addons-ha.yml deleted file mode 100644 index 821988ffcea..00000000000 --- a/tests/files/packet_centos8-flannel-addons-ha.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: ha - -# Kubespray settings -kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085 -kube_proxy_mode: iptables -kube_network_plugin: flannel -download_localhost: false -download_run_once: true -helm_enabled: true -krew_enabled: true -kubernetes_audit: true -etcd_events_cluster_enabled: true -local_volume_provisioner_enabled: true -kube_encrypt_secret_data: true -ingress_nginx_enabled: true -ingress_nginx_webhook_enabled: true -ingress_nginx_webhook_job_ttl: 30 -cert_manager_enabled: true -# Disable as health checks are still unstable and slow to respond. -metrics_server_enabled: false -metrics_server_kubelet_insecure_tls: true -kube_token_auth: true -enable_nodelocaldns: false -kubelet_rotate_server_certificates: true -kubelet_csr_approver_enabled: false - -kube_oidc_url: https://accounts.google.com/.well-known/openid-configuration -kube_oidc_client_id: kubespray-example - -tls_min_version: "VersionTLS12" -tls_cipher_suites: - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - -# test etcd tls cipher suites -etcd_tls_cipher_suites: - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - -# Containerd -containerd_storage_dir: /var/data/containerd -containerd_state_dir: /run/cri/containerd -containerd_oom_score: -999 - -# Kube-vip -kube_vip_enabled: true -kube_vip_arp_enabled: true -kube_vip_controlplane_enabled: true -kube_vip_address: 192.168.1.100 - -# MetalLB -metallb_enabled: true -metallb_speaker_enabled: true -metallb_config: - address_pools: - primary: - ip_range: - - 192.0.1.0-192.0.1.254 - auto_assign: true - pool1: - ip_range: - - 192.0.2.1-192.0.2.1 - auto_assign: false - pool2: - ip_range: - - 192.0.2.2-192.0.2.2 - auto_assign: false - - layer2: - - primary - - pool1 - - pool2 diff --git a/tests/files/packet_centos8-multus-calico.yml b/tests/files/packet_centos8-multus-calico.yml deleted file mode 100644 index 7337537e49c..00000000000 --- a/tests/files/packet_centos8-multus-calico.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: default - -# Kubespray settings -kube_network_plugin_multus: true diff --git a/tests/files/packet_centos8-weave-upgrade-ha.yml b/tests/files/packet_centos8-weave-upgrade-ha.yml deleted file mode 100644 index 25ca8d37059..00000000000 --- a/tests/files/packet_centos8-weave-upgrade-ha.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: ha - -# Kubespray settings -kube_network_plugin: weave -kubernetes_audit: true - -# Needed to upgrade from 1.16 to 1.17, otherwise upgrade is partial and bug followed -upgrade_cluster_setup: true diff --git a/tests/files/packet_ubuntu20-docker-weave-sep.yml b/tests/files/packet_ubuntu20-docker-weave-sep.yml deleted file mode 100644 index 8c6584caa1c..00000000000 --- a/tests/files/packet_ubuntu20-docker-weave-sep.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-2004 -mode: separate - -# Kubespray settings -kube_network_plugin: weave -auto_renew_certificates: true - -# Docker specific settings: -container_manager: docker -etcd_deployment_type: docker -resolvconf_mode: docker_dns - -# Ubuntu 16 - docker containerd package available stopped at 1.4.6 -docker_containerd_version: latest diff --git a/tests/files/vagrant_centos8-kube-router.rb b/tests/files/vagrant_centos8-kube-router.rb deleted file mode 100644 index c7426fb3fce..00000000000 --- a/tests/files/vagrant_centos8-kube-router.rb +++ /dev/null @@ -1,15 +0,0 @@ -$num_instances = 2 -$vm_memory ||= 2048 -$os = "centos8" - -$kube_master_instances = 1 -$etcd_instances = 1 - -# For CI we are not worried about data persistence across reboot -$libvirt_volume_cache = "unsafe" - -# Checking for box update can trigger API rate limiting -# https://www.vagrantup.com/docs/vagrant-cloud/request-limits.html -$box_check_update = false - -$network_plugin = "kube-router" diff --git a/tests/files/vagrant_centos8-kube-router.yml b/tests/files/vagrant_centos8-kube-router.yml deleted file mode 100644 index 434c37c96ba..00000000000 --- a/tests/files/vagrant_centos8-kube-router.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Instance settings -cloud_image: centos-8 -mode: default - -# Kubespray settings -kube_network_plugin: kube-router -enable_network_policy: true diff --git a/tests/files/vagrant_ubuntu20-weave-medium.rb b/tests/files/vagrant_ubuntu20-weave-medium.rb deleted file mode 100644 index 6cf49c95fd2..00000000000 --- a/tests/files/vagrant_ubuntu20-weave-medium.rb +++ /dev/null @@ -1,7 +0,0 @@ -$num_instances = 16 -$vm_memory ||= 2048 -$os = "ubuntu2004" -$network_plugin = "weave" -$kube_master_instances = 1 -$etcd_instances = 1 -$playbook = "tests/cloud_playbooks/wait-for-ssh.yml" diff --git a/tests/files/vagrant_ubuntu20-weave-medium.yml b/tests/files/vagrant_ubuntu20-weave-medium.yml deleted file mode 100644 index bb5f9744761..00000000000 --- a/tests/files/vagrant_ubuntu20-weave-medium.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# Kubespray settings -kube_network_plugin: weave From 5bfc3396e93a3865880ae3c81435669027ae95ba Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Thu, 12 Dec 2024 09:15:18 +0100 Subject: [PATCH 2/2] CI: ignore Mem errors for some failing test in ci-extended --- tests/files/packet_ubuntu22-all-in-one-docker.yml | 2 ++ tests/files/packet_ubuntu24-all-in-one-docker.yml | 2 ++ tests/files/packet_ubuntu24-calico-all-in-one.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/files/packet_ubuntu22-all-in-one-docker.yml b/tests/files/packet_ubuntu22-all-in-one-docker.yml index fcdd8f3ccfa..b0ee5ec48ea 100644 --- a/tests/files/packet_ubuntu22-all-in-one-docker.yml +++ b/tests/files/packet_ubuntu22-all-in-one-docker.yml @@ -6,6 +6,8 @@ vm_memory: 1600 # Kubespray settings auto_renew_certificates: true +kubeadm_ignore_preflight_errors: + - Mem # 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 diff --git a/tests/files/packet_ubuntu24-all-in-one-docker.yml b/tests/files/packet_ubuntu24-all-in-one-docker.yml index 8b1da4ac0cb..d2a0100096c 100644 --- a/tests/files/packet_ubuntu24-all-in-one-docker.yml +++ b/tests/files/packet_ubuntu24-all-in-one-docker.yml @@ -6,6 +6,8 @@ vm_memory: 1600 # Kubespray settings auto_renew_certificates: true +kubeadm_ignore_preflight_errors: + - Mem # Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko kube_proxy_mode: iptables diff --git a/tests/files/packet_ubuntu24-calico-all-in-one.yml b/tests/files/packet_ubuntu24-calico-all-in-one.yml index 310bf349fa8..24ae2dea001 100644 --- a/tests/files/packet_ubuntu24-calico-all-in-one.yml +++ b/tests/files/packet_ubuntu24-calico-all-in-one.yml @@ -6,6 +6,8 @@ vm_memory: 1600 # Kubespray settings auto_renew_certificates: true +kubeadm_ignore_preflight_errors: + - Mem # Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko kube_proxy_mode: iptables