From 5baacd41fd60dc7dcfe12e6b7d22daa7ef00d92b Mon Sep 17 00:00:00 2001 From: Ali Afsharzadeh Date: Thu, 15 Oct 2026 17:22:10 +0330 Subject: [PATCH 1/2] Remove Debian 11 CI jobs Debian 11 LTS ended and its packages were removed from security.debian.org, so these jobs fail with 404 on every PR. Signed-off-by: Ali Afsharzadeh --- .gitlab-ci/kubevirt.yml | 7 -- docs/developers/ci.md | 87 +++++++++---------- tests/files/debian11-calico-collection.yml | 6 -- tests/files/debian11-calico-upgrade | 1 - tests/files/debian11-calico-upgrade-once | 1 - tests/files/debian11-calico-upgrade-once.yml | 18 ---- tests/files/debian11-calico-upgrade.yml | 18 ---- tests/files/debian11-custom-cni.yml | 12 --- tests/files/debian11-docker.yml | 8 -- tests/files/debian11-kubelet-csr-approver.yml | 13 --- tests/files/debian11-macvlan.yml | 13 --- 11 files changed, 42 insertions(+), 142 deletions(-) delete mode 100644 tests/files/debian11-calico-collection.yml delete mode 100644 tests/files/debian11-calico-upgrade delete mode 100644 tests/files/debian11-calico-upgrade-once delete mode 100644 tests/files/debian11-calico-upgrade-once.yml delete mode 100644 tests/files/debian11-calico-upgrade.yml delete mode 100644 tests/files/debian11-custom-cni.yml delete mode 100644 tests/files/debian11-docker.yml delete mode 100644 tests/files/debian11-kubelet-csr-approver.yml delete mode 100644 tests/files/debian11-macvlan.yml diff --git a/.gitlab-ci/kubevirt.yml b/.gitlab-ci/kubevirt.yml index 171bd4183..c6d3a45cd 100644 --- a/.gitlab-ci/kubevirt.yml +++ b/.gitlab-ci/kubevirt.yml @@ -36,8 +36,6 @@ pr: - TESTCASE: - almalinux9-crio - almalinux9-kube-ovn - - debian11-calico-collection - - debian11-macvlan - debian12-cilium - debian13-cilium - fedora39-kube-router @@ -86,8 +84,6 @@ pr_full: - TESTCASE: - almalinux9-calico-ha-ebpf - almalinux9-calico-nodelocaldns-secondary - - debian11-custom-cni - - debian11-kubelet-csr-approver - debian12-custom-cni-helm - fedora39-calico-swap-selinux - fedora39-crio @@ -123,7 +119,6 @@ pr_extended: - almalinux9-calico - almalinux9-calico-remove-node - almalinux9-docker - - debian11-docker - debian12-calico - debian12-docker - debian13-calico @@ -145,8 +140,6 @@ periodic: parallel: matrix: - TESTCASE: - - debian11-calico-upgrade - - debian11-calico-upgrade-once - debian12-cilium-svc-proxy - fedora39-calico-selinux - fedora40-docker-calico diff --git a/docs/developers/ci.md b/docs/developers/ci.md index b755ff602..2b7c2194d 100644 --- a/docs/developers/ci.md +++ b/docs/developers/ci.md @@ -4,54 +4,51 @@ To generate this Matrix run `./tests/scripts/md-table/main.py` ## containerd -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | -|---| --- | --- | --- | --- | --- | --- | --- | -almalinux9 | :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: | -debian13 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | -fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -flatcar4081 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux10 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -ubuntu22 | :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: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | +|---| --- | --- | --- | --- | --- | --- | +almalinux9 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | +amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +debian12 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | +debian13 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | +fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | +fedora40 | :x: | :x: | :x: | :x: | :x: | :x: | +flatcar4081 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +rockylinux10 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | +rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | ## crio -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | -|---| --- | --- | --- | --- | --- | --- | --- | -almalinux9 | :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: | -debian13 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | +|---| --- | --- | --- | --- | --- | --- | +almalinux9 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | +debian12 | :x: | :x: | :x: | :x: | :x: | :x: | +debian13 | :x: | :x: | :x: | :x: | :x: | :x: | +fedora39 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | ## docker -| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | macvlan | -|---| --- | --- | --- | --- | --- | --- | --- | -almalinux9 | :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: | -debian13 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora39 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -rockylinux9 | :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: | +| OS / CNI | calico | cilium | custom_cni | flannel | kube-ovn | kube-router | +|---| --- | --- | --- | --- | --- | --- | +almalinux9 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +amazon | :x: | :x: | :x: | :x: | :x: | :x: | +debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +debian13 | :x: | :x: | :x: | :x: | :x: | :x: | +fedora39 | :x: | :x: | :x: | :x: | :x: | :x: | +fedora40 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | +openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | +rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | +ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | diff --git a/tests/files/debian11-calico-collection.yml b/tests/files/debian11-calico-collection.yml deleted file mode 100644 index 472eeca65..000000000 --- a/tests/files/debian11-calico-collection.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true diff --git a/tests/files/debian11-calico-upgrade b/tests/files/debian11-calico-upgrade deleted file mode 100644 index 77bf528c8..000000000 --- a/tests/files/debian11-calico-upgrade +++ /dev/null @@ -1 +0,0 @@ -UPGRADE_TEST=graceful diff --git a/tests/files/debian11-calico-upgrade-once b/tests/files/debian11-calico-upgrade-once deleted file mode 100644 index 77bf528c8..000000000 --- a/tests/files/debian11-calico-upgrade-once +++ /dev/null @@ -1 +0,0 @@ -UPGRADE_TEST=graceful diff --git a/tests/files/debian11-calico-upgrade-once.yml b/tests/files/debian11-calico-upgrade-once.yml deleted file mode 100644 index 1d2f1c6ea..000000000 --- a/tests/files/debian11-calico-upgrade-once.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Kubespray settings -download_run_once: true - -# Pin disabling ipip mode to ensure proper upgrade -ipip: false -calico_pool_blocksize: 26 -calico_vxlan_mode: Always -calico_network_backend: bird - -# Needed to bypass deprecation check -ignore_assert_errors: true - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true diff --git a/tests/files/debian11-calico-upgrade.yml b/tests/files/debian11-calico-upgrade.yml deleted file mode 100644 index 1fadcb45f..000000000 --- a/tests/files/debian11-calico-upgrade.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Pin disabling ipip mode to ensure proper upgrade -ipip: false -calico_pool_blocksize: 26 -calico_vxlan_mode: Always -calico_network_backend: bird - -# Needed to bypass deprecation check -ignore_assert_errors: true - -# Remove anonymous access to cluster -remove_anonymous_access: true - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true diff --git a/tests/files/debian11-custom-cni.yml b/tests/files/debian11-custom-cni.yml deleted file mode 100644 index 726a65c45..000000000 --- a/tests/files/debian11-custom-cni.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Kubespray settings -kube_owner: root -kube_network_plugin: custom_cni -custom_cni_manifests: - - "{{ playbook_dir }}/../tests/files/custom_cni/cilium.yaml" - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true diff --git a/tests/files/debian11-docker.yml b/tests/files/debian11-docker.yml deleted file mode 100644 index ddce35e8b..000000000 --- a/tests/files/debian11-docker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Use docker -container_manager: docker -etcd_deployment_type: docker -resolvconf_mode: docker_dns diff --git a/tests/files/debian11-kubelet-csr-approver.yml b/tests/files/debian11-kubelet-csr-approver.yml deleted file mode 100644 index b6ce93244..000000000 --- a/tests/files/debian11-kubelet-csr-approver.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Kubespray settings -kubelet_rotate_server_certificates: true -kubelet_csr_approver_enabled: true -kubelet_csr_approver_values: - # Do not check DNS resolution in testing (not recommended in production) - bypassDnsResolution: true - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true diff --git a/tests/files/debian11-macvlan.yml b/tests/files/debian11-macvlan.yml deleted file mode 100644 index c7daf7f88..000000000 --- a/tests/files/debian11-macvlan.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image: debian-11 - -# Kubespray settings -kube_network_plugin: macvlan -enable_nodelocaldns: false -kube_proxy_masquerade_all: true -macvlan_interface: "eth0" -auto_renew_certificates: true - -# Use static containerd binary for older distributions like Debian 11. -containerd_static_binary: true From 2747bd4a3b3d388f6f596e150191ff405128cdf2 Mon Sep 17 00:00:00 2001 From: Ali Afsharzadeh Date: Tue, 13 Oct 2026 09:52:06 +0330 Subject: [PATCH 2/2] Fix terraform validate for the exoscale provider (#13637) * Pin the exoscale terraform provider below 0.75 Signed-off-by: Ali Afsharzadeh * Use lowercase state for exoscale compute instances Signed-off-by: Ali Afsharzadeh --------- Signed-off-by: Ali Afsharzadeh --- contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf | 4 ++-- .../terraform/exoscale/modules/kubernetes-cluster/versions.tf | 2 +- contrib/terraform/exoscale/versions.tf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf b/contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf index 3ea4f4f2c..100126f05 100644 --- a/contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf +++ b/contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf @@ -41,7 +41,7 @@ resource "exoscale_compute_instance" "master" { template_id = data.exoscale_template.os_image[each.key].id type = each.value.size disk_size = each.value.boot_disk.root_partition_size + each.value.boot_disk.node_local_partition_size + each.value.boot_disk.ceph_partition_size - state = "Running" + state = "running" zone = var.zone security_group_ids = [exoscale_security_group.master_sg.id] network_interface { @@ -73,7 +73,7 @@ resource "exoscale_compute_instance" "worker" { template_id = data.exoscale_template.os_image[each.key].id type = each.value.size disk_size = each.value.boot_disk.root_partition_size + each.value.boot_disk.node_local_partition_size + each.value.boot_disk.ceph_partition_size - state = "Running" + state = "running" zone = var.zone security_group_ids = [exoscale_security_group.worker_sg.id] network_interface { diff --git a/contrib/terraform/exoscale/modules/kubernetes-cluster/versions.tf b/contrib/terraform/exoscale/modules/kubernetes-cluster/versions.tf index 047420aec..9f1631394 100644 --- a/contrib/terraform/exoscale/modules/kubernetes-cluster/versions.tf +++ b/contrib/terraform/exoscale/modules/kubernetes-cluster/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { exoscale = { source = "exoscale/exoscale" - version = ">= 0.21" + version = ">= 0.21, < 0.75" } } required_version = ">= 0.13" diff --git a/contrib/terraform/exoscale/versions.tf b/contrib/terraform/exoscale/versions.tf index 0333b41b9..fe72553cd 100644 --- a/contrib/terraform/exoscale/versions.tf +++ b/contrib/terraform/exoscale/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { exoscale = { source = "exoscale/exoscale" - version = ">= 0.21" + version = ">= 0.21, < 0.75" } null = { source = "hashicorp/null"