Browse Source

Fix CI for Fedora (followup) + OpenSUSE Leap (update to 15.3) (#8407)

* Fix fedora jobs - followup

* Update OpenSUSE Leap to 15.3

* Fix cilium version in README + update minor 1.11.1
pull/8470/head
Florian Ruynat 3 years ago
committed by GitHub
parent
commit
d580014c66
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 8 deletions
  1. 2
      README.md
  2. 2
      Vagrantfile
  3. 2
      docs/opensuse.md
  4. 2
      roles/container-engine/containerd/molecule/default/molecule.yml
  5. 2
      roles/download/defaults/main.yml
  6. 6
      test-infra/image-builder/roles/kubevirt-images/defaults/main.yml
  7. 4
      tests/files/packet_fedora35-calico-swap-selinux.yml
  8. 4
      tests/files/packet_fedora35-crio.yml

2
README.md

@ -140,7 +140,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [cni-plugins](https://github.com/containernetworking/plugins) v1.0.1
- [calico](https://github.com/projectcalico/calico) v3.20.3
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- [cilium](https://github.com/cilium/cilium) v1.9.11
- [cilium](https://github.com/cilium/cilium) v1.11.1
- [flanneld](https://github.com/flannel-io/flannel) v0.15.1
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.8.1
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.4.0

2
Vagrantfile

@ -30,7 +30,7 @@ SUPPORTED_OS = {
"almalinux8-bento" => {box: "bento/almalinux-8", user: "vagrant"},
"fedora34" => {box: "fedora/34-cloud-base", user: "vagrant"},
"fedora35" => {box: "fedora/35-cloud-base", user: "vagrant"},
"opensuse" => {box: "bento/opensuse-leap-15.2", user: "vagrant"},
"opensuse" => {box: "opensuse/Leap-15.3.x86_64", user: "vagrant"},
"opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"},
"oraclelinux" => {box: "generic/oracle7", user: "vagrant"},
"oraclelinux8" => {box: "generic/oracle8", user: "vagrant"},

2
docs/opensuse.md

@ -1,4 +1,4 @@
# openSUSE Leap 15.2 and Tumbleweed
# openSUSE Leap 15.3 and Tumbleweed
openSUSE Leap installation Notes:

2
roles/container-engine/containerd/molecule/default/molecule.yml

@ -32,7 +32,7 @@ platforms:
- kube_node
- k8s_cluster
- name: opensuse
box: opensuse/Leap-15.2.x86_64
box: opensuse/Leap-15.3.x86_64
cpus: 1
memory: 1024
groups:

2
roles/download/defaults/main.yml

@ -107,7 +107,7 @@ flannel_cni_version: "v1.0.0"
cni_version: "v1.0.1"
weave_version: 2.8.1
pod_infra_version: "3.3"
cilium_version: "v1.11.0"
cilium_version: "v1.11.1"
kube_ovn_version: "v1.8.1"
kube_router_version: "v1.4.0"
multus_version: "v3.8"

6
test-infra/image-builder/roles/kubevirt-images/defaults/main.yml

@ -98,8 +98,8 @@ images:
tag: "latest"
opensuse-leap-15:
filename: openSUSE-Leap-15.2-OpenStack.x86_64-0.0.4-Build8.25.qcow2
url: https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.2/images/openSUSE-Leap-15.2-OpenStack.x86_64-0.0.4-Build8.25.qcow2
checksum: sha256:4df9cee9281d1f57d20f79dc65d76e255592b904760e73c0dd44ac753a54330f
filename: openSUSE-Leap-15.3.x86_64-1.0.1-NoCloud-Build2.63.qcow2
url: https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.3/images/openSUSE-Leap-15.3.x86_64-1.0.1-NoCloud-Build2.63.qcow2
checksum: sha256:289248945e2d058551c71c1bdcb31a361cefe7136c7fd88a09b524eedfaf5215
converted: true
tag: "latest"

4
tests/files/packet_fedora35-calico-swap-selinux.yml

@ -5,6 +5,10 @@ mode: default
# Kubespray settings
auto_renew_certificates: true
# Switching to iptable due to https://github.com/projectcalico/calico/issues/5011
# Kubernetes v1.23.0 kube-proxy does use v.7.x now. Calico v3.20.x/v3.21.x Pods show the following error
# Bad return code from 'ipset list'. error=exit status 1 family="inet" stderr="ipset v7.1: Kernel and userspace incompatible: settype hash:ip,port with revision 6 not supported by userspace.
kube_proxy_mode: iptables
# Test with SELinux in enforcing mode
preinstall_selinux_state: enforcing

4
tests/files/packet_fedora35-crio.yml

@ -6,6 +6,10 @@ mode: default
# Kubespray settings
container_manager: crio
auto_renew_certificates: true
# Switching to iptable due to https://github.com/projectcalico/calico/issues/5011
# Kubernetes v1.23.0 kube-proxy does use v.7.x now. Calico v3.20.x/v3.21.x Pods show the following error
# Bad return code from 'ipset list'. error=exit status 1 family="inet" stderr="ipset v7.1: Kernel and userspace incompatible: settype hash:ip,port with revision 6 not supported by userspace.
kube_proxy_mode: iptables
# Test with SELinux in enforcing mode
preinstall_selinux_state: enforcing
Loading…
Cancel
Save