Hi Bruce,

Could you please also backport this patch to the honister branch? Thanks!

Richard
________________________________
From: [email protected] 
<[email protected]> on behalf of Richard Neill via 
lists.yoctoproject.org <[email protected]>
Sent: Wednesday, April 13, 2022 10:16 AM
To: [email protected] 
<[email protected]>
Cc: nd <[email protected]>
Subject: [meta-virtualization] [PATCH] k3s: Add missing IP Virtual Server 
(ip_vs) feature to the kernel config

K3s (and Kubernetes) supports load balancing via IPVS, and by default reports
errors when IPVS kernel modules cannot be loaded.

This patch adds the missing reported kernel modules to the k3s recipe, and
orders the kernel module list alphabetically:

    * ip-vs
    * ip-vs-rr
    * ip-vs-wrr
    * ip-vs-sh

The modules are configured by including the ip_vs kernel feature.

Signed-off-by: Richard Neill <[email protected]>
---
 recipes-containers/k3s/k3s_git.bb             | 22 +++++++++++--------
 .../linux/linux-yocto/kubernetes.scc          |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/recipes-containers/k3s/k3s_git.bb 
b/recipes-containers/k3s/k3s_git.bb
index e2a3ffc..0b56e3c 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -2690,20 +2690,24 @@ RDEPENDS:${PN}-server = "${PN}"
 RDEPENDS:${PN}-agent = "${PN}"

 RRECOMMENDS:${PN} = "\
+                     kernel-module-ip-vs \
+                     kernel-module-ip-vs-rr \
+                     kernel-module-ip-vs-sh \
+                     kernel-module-ip-vs-wrr \
+                     kernel-module-nfnetlink-log \
+                     kernel-module-vxlan \
                      kernel-module-xt-addrtype \
-                     kernel-module-xt-nat \
-                     kernel-module-xt-multiport \
-                     kernel-module-xt-conntrack \
                      kernel-module-xt-comment \
-                     kernel-module-xt-mark \
                      kernel-module-xt-connmark \
-                     kernel-module-vxlan \
+                     kernel-module-xt-conntrack \
+                     kernel-module-xt-limit \
+                     kernel-module-xt-mark \
                      kernel-module-xt-masquerade \
-                     kernel-module-xt-statistic \
-                     kernel-module-xt-physdev \
+                     kernel-module-xt-multiport \
+                     kernel-module-xt-nat \
                      kernel-module-xt-nflog \
-                     kernel-module-xt-limit \
-                     kernel-module-nfnetlink-log \
+                     kernel-module-xt-physdev \
+                     kernel-module-xt-statistic \
                      "

 RCONFLICTS:${PN} = "kubectl"
diff --git a/recipes-kernel/linux/linux-yocto/kubernetes.scc 
b/recipes-kernel/linux/linux-yocto/kubernetes.scc
index 1e93b70..a94ae84 100644
--- a/recipes-kernel/linux/linux-yocto/kubernetes.scc
+++ b/recipes-kernel/linux/linux-yocto/kubernetes.scc
@@ -1,2 +1,3 @@
 include docker.scc
+include cgl/cfg/net/ip_vs.scc
 kconf non-hardware kubernetes.cfg
--
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7166): 
https://lists.yoctoproject.org/g/meta-virtualization/message/7166
Mute This Topic: https://lists.yoctoproject.org/mt/90436886/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to