From d007132655b7b6f702c63c6fd6b49575a2eb0b83 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:01:17 +0100
Subject: [PATCH] Fix Fedora CI following ipset version in kube-proxy for k8s
 1.23 (#8397)

---
 tests/files/packet_fedora34-calico-selinux.yml | 4 ++++
 tests/files/packet_fedora35-docker-calico.yml  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tests/files/packet_fedora34-calico-selinux.yml b/tests/files/packet_fedora34-calico-selinux.yml
index 1e8a4d94c..851b7827b 100644
--- a/tests/files/packet_fedora34-calico-selinux.yml
+++ b/tests/files/packet_fedora34-calico-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
diff --git a/tests/files/packet_fedora35-docker-calico.yml b/tests/files/packet_fedora35-docker-calico.yml
index e3c6efa15..4542b6a6c 100644
--- a/tests/files/packet_fedora35-docker-calico.yml
+++ b/tests/files/packet_fedora35-docker-calico.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
 
 # Docker specific settings:
 container_manager: docker