[release/v1.4] Enable nf_conntrack module by default (#2283)

* Enable nf_conntrack module by default

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

* Update fixtures

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

pkg/scripts/funcs.go

@@ -47,6 +47,11 @@ var (
 		sudo modprobe overlay
 		sudo modprobe br_netfilter
 		sudo modprobe ip_tables
+		if modinfo nf_conntrack_ipv4 &> /dev/null; then
+			sudo modprobe nf_conntrack_ipv4
+		else
+			sudo modprobe nf_conntrack
+		fi
 		sudo mkdir -p /etc/sysctl.d
 		cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 		fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-with_cilium.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-force.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-simple.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden

@@ -18,6 +18,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-simple.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden

@@ -16,6 +16,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-force.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576

pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden

@@ -27,6 +27,11 @@ EOF
 sudo modprobe overlay
 sudo modprobe br_netfilter
 sudo modprobe ip_tables
+if modinfo nf_conntrack_ipv4 &> /dev/null; then
+	sudo modprobe nf_conntrack_ipv4
+else
+	sudo modprobe nf_conntrack
+fi
 sudo mkdir -p /etc/sysctl.d
 cat <<EOF | sudo tee /etc/sysctl.d/k8s.conf
 fs.inotify.max_user_watches         = 1048576