From 00e0f3bd2bf3ce4f83359c30e34545f32af20d20 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Mon, 7 Dec 2020 21:17:11 -0500
Subject: [PATCH] Fix nf_conntrack_ipv4 modprobe (#6988)
RedHat 8.3 merged nf_conntrack_ipv4 in nf_conntrack but still advertise 4.18
so just try to modprobe and decide depending on the success
Also nf_conntrack is a dependency of ip_vs, so no need to care about it
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
roles/kubernetes/node/tasks/main.yml | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml
index 46e5d5e77..8c6adf6b9 100644
--- a/roles/kubernetes/node/tasks/main.yml
+++ b/roles/kubernetes/node/tasks/main.yml
@@ -103,23 +103,13 @@
tags:
- kube-proxy
-- name: Modprobe nf_conntrack_ipv4 for kernels < 4.19
+- name: Modprobe nf_conntrack_ipv4
modprobe:
name: nf_conntrack_ipv4
state: present
- register: enable_nf_conntrack
+ register: modprobe_nf_conntrack_ipv4
+ ignore_errors: yes
when:
- - ansible_kernel.split('.')[0:3] | join('.') < '4.19'
- - kube_proxy_mode == 'ipvs'
- tags:
- - kube-proxy
-
-- name: Modprobe nf_conntrack for kernels >= 4.19
- modprobe:
- name: nf_conntrack
- state: present
- when:
- - ansible_kernel.split('.')[0:3] | join('.') >= '4.19'
- kube_proxy_mode == 'ipvs'
tags:
- kube-proxy
@@ -132,9 +122,7 @@
ip_vs_rr
ip_vs_wrr
ip_vs_sh
- {% if enable_nf_conntrack is failed -%}
- nf_conntrack
- {%- else -%}
+ {% if modprobe_nf_conntrack_ipv4 is success -%}
nf_conntrack_ipv4
{%- endif -%}
when: kube_proxy_mode == 'ipvs'
--
GitLab