External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-30 06:13:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13659 from guoard/ci_fixes/release-2.30

Browse Source 
[release-2.30] Fix exoscale terraform validate and remove Debian 11 CI jobs
This commit is contained in:
kubernetes-prow[bot]
2026-10-15 14:32:27 +00:00
committed by GitHub
parent 0e46cf4108 2747bd4a3b
commit c5a2be0fb9
14 changed files with 46 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci/kubevirt.yml
-7
View File
@@ -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
contrib/terraform/exoscale/modules/kubernetes-cluster/main.tf
+2 -2
View File
@@ -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 {
contrib/terraform/exoscale/modules/kubernetes-cluster/versions.tf
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
exoscale = {
source = "exoscale/exoscale"
version = ">= 0.21"
version = ">= 0.21, < 0.75"
}
}
required_version = ">= 0.13"
contrib/terraform/exoscale/versions.tf
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
exoscale = {
source = "exoscale/exoscale"
version = ">= 0.21"
version = ">= 0.21, < 0.75"
}
null = {
source = "hashicorp/null"
docs/developers/ci.md
+42 -45
View File
@@ -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: |
tests/files/debian11-calico-collection.yml
-6
View File
@@ -1,6 +0,0 @@
---
# Instance settings
cloud_image: debian-11
# Use static containerd binary for older distributions like Debian 11.
containerd_static_binary: true
tests/files/debian11-calico-upgrade
-1
View File
@@ -1 +0,0 @@
UPGRADE_TEST=graceful
tests/files/debian11-calico-upgrade-once
-1
View File
@@ -1 +0,0 @@
UPGRADE_TEST=graceful
tests/files/debian11-calico-upgrade-once.yml
-18
View File
@@ -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
tests/files/debian11-calico-upgrade.yml
-18
View File
@@ -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
tests/files/debian11-custom-cni.yml
-12
View File
@@ -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
tests/files/debian11-docker.yml
-8
View File
@@ -1,8 +0,0 @@
---
# Instance settings
cloud_image: debian-11
# Use docker
container_manager: docker
etcd_deployment_type: docker
resolvconf_mode: docker_dns
tests/files/debian11-kubelet-csr-approver.yml
-13
View File
@@ -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
tests/files/debian11-macvlan.yml
-13
View File
@@ -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