summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Neill <richard.neill@arm.com>2022-04-14 11:17:12 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-04-20 14:12:03 -0400
commit6ed391fdb046eaf4eb0c4ade3cd184231b985f10 (patch)
tree478498949372a0d2e5e49df6cf0ca1de9f669f6d
parente02f0d33916dd70a63cc03bf049f73d9cac7bdc8 (diff)
downloadmeta-virtualization-6ed391fdb046eaf4eb0c4ade3cd184231b985f10.tar.gz
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: * 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 <richard.neill@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/k3s/k3s_git.bb4
-rw-r--r--recipes-kernel/linux/linux-yocto/kubernetes.scc1
2 files changed, 5 insertions, 0 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index 53a86777..a20092c5 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -2704,6 +2704,10 @@ RRECOMMENDS:${PN} = "\
2704 kernel-module-xt-nflog \ 2704 kernel-module-xt-nflog \
2705 kernel-module-xt-limit \ 2705 kernel-module-xt-limit \
2706 kernel-module-nfnetlink-log \ 2706 kernel-module-nfnetlink-log \
2707 kernel-module-ip-vs \
2708 kernel-module-ip-vs-rr \
2709 kernel-module-ip-vs-sh \
2710 kernel-module-ip-vs-wrr \
2707 " 2711 "
2708 2712
2709RCONFLICTS:${PN} = "kubectl" 2713RCONFLICTS:${PN} = "kubectl"
diff --git a/recipes-kernel/linux/linux-yocto/kubernetes.scc b/recipes-kernel/linux/linux-yocto/kubernetes.scc
index 1e93b704..a94ae845 100644
--- a/recipes-kernel/linux/linux-yocto/kubernetes.scc
+++ b/recipes-kernel/linux/linux-yocto/kubernetes.scc
@@ -1,2 +1,3 @@
1include docker.scc 1include docker.scc
2include cgl/cfg/net/ip_vs.scc
2kconf non-hardware kubernetes.cfg 3kconf non-hardware kubernetes.cfg