On Wed, Nov 3, 2021 at 9:05 AM Richard Neill <[email protected]> wrote:

> Hi,
>
> If possible, could this patch also be added to the honister branch?
>

It's just  configuration tweak, so I can do that.

I have some other k3s changes in flight (version bumps, packaging and
unifying of configuration into the main config repository), but I've added
these and expect to push them in a few days.

Bruce



>
> Thanks,
> Richard
> ------------------------------
> *From:* [email protected] <
> [email protected]> on behalf of Richard Neill
> via lists.yoctoproject.org <[email protected]>
> *Sent:* Wednesday, November 3, 2021 1:01 PM
> *To:* [email protected] <
> [email protected]>
> *Cc:* nd <[email protected]>
> *Subject:* [meta-virtualization] [PATCH] k3s: Add additional required
> kernel modules
>
> Adds the following kernel modules for k3s:
>
> * xt-physdev
> * xt-nflog
> * xt-limit
> * nfnetlink-log
>
> Without them, the k3s network-policy-controller reports failures in the log
> related to iptables-restore.
>
> Signed-off-by: Richard Neill <[email protected]>
> ---
>  recipes-containers/k3s/k3s_git.bb               | 4 ++++
>  recipes-kernel/linux/linux-yocto/kubernetes.cfg | 8 ++++++--
>  2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/
> k3s_git.bb
> index e341ad7..4e1cf64 100644
> --- a/recipes-containers/k3s/k3s_git.bb
> +++ b/recipes-containers/k3s/k3s_git.bb
> @@ -96,6 +96,10 @@ RRECOMMENDS:${PN} = "\
>                       kernel-module-vxlan \
>                       kernel-module-xt-masquerade \
>                       kernel-module-xt-statistic \
> +                     kernel-module-xt-physdev \
> +                     kernel-module-xt-nflog \
> +                     kernel-module-xt-limit \
> +                     kernel-module-nfnetlink-log \
>                       "
>
>  RCONFLICTS:${PN} = "kubectl"
> diff --git a/recipes-kernel/linux/linux-yocto/kubernetes.cfg
> b/recipes-kernel/linux/linux-yocto/kubernetes.cfg
> index 2d4e1f5..84fa8c5 100644
> --- a/recipes-kernel/linux/linux-yocto/kubernetes.cfg
> +++ b/recipes-kernel/linux/linux-yocto/kubernetes.cfg
> @@ -13,9 +13,14 @@ CONFIG_IP_VS_NFCT=y
>  CONFIG_IP_VS_PROTO_TCP=y
>  CONFIG_IP_VS_PROTO_UDP=y
>  CONFIG_IP_VS_RR=m
> +CONFIG_NETFILTER_NETLINK_LOG=m
> +CONFIG_NETFILTER_XT_CONNMARK=m
>  CONFIG_NETFILTER_XT_MATCH_COMMENT=m
> +CONFIG_NETFILTER_XT_MATCH_LIMIT=m
>  CONFIG_NETFILTER_XT_MATCH_MARK=m
> -CONFIG_NETFILTER_XT_CONNMARK=m
> +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
> +CONFIG_NETFILTER_XT_TARGET_NFLOG=m
> +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
>  CONFIG_NAMESPACES=y
>  CONFIG_NET_NS=y
>  CONFIG_PID_NS=y
> @@ -32,4 +37,3 @@ CONFIG_MEMCG=y
>  CONFIG_INET=y
>  CONFIG_EXT4_FS=y
>  CONFIG_PROC_FS=y
> -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
> --
> 2.25.1
>
>
> 
>
>

-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6876): 
https://lists.yoctoproject.org/g/meta-virtualization/message/6876
Mute This Topic: https://lists.yoctoproject.org/mt/86790083/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to