mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-11-04 10:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: check for IPv6 before applying accept_ra

Browse Source 
When IPv6 is disabled entirely, we should not try to set `accept_ra`,
since it does not exist.
This performs a check before adding the default kernel parameter.

Fixes #5087

Signed-off-by: Seán C McCord <ulexus@gmail.com>
This commit is contained in:
Seán C McCord 2022-03-06 15:12:21 -05:00
parent 59681b8c9a
commit 2a7f9a4457
No known key found for this signature in database
GPG Key ID: F6EB911089C33F61
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/app/machined/pkg/controllers/runtime/kernel_param_defaults.go
View File

@ -6,6 +6,8 @@ package runtime
import (
"context"
"errors"
"os"
"github.com/cosi-project/runtime/pkg/controller"
"github.com/cosi-project/runtime/pkg/resource"
@ -60,10 +62,6 @@ func (ctrl *KernelParamDefaultsController) Run(ctx context.Context, r controller
if err := r.Modify(ctx, item, func(res resource.Resource) error {
res.(*runtime.KernelParamDefaultSpec).TypedSpec().Value = value
if res.Metadata().ID() == "proc.sys.net.ipv6.conf.default.forwarding" {
res.(*runtime.KernelParamDefaultSpec).TypedSpec().IgnoreErrors = true
}
return nil
}); err != nil {
return err
@ -95,6 +93,11 @@ func (ctrl *KernelParamDefaultsController) getKernelParams() []*kernel.Param {
}...)
}
// Apply IPv6 defaults only if IPv6 is enabled.
// NB: we only prevent the application of these rules if the IPv6 node does not exist.
// Other errors should be ignored here so that they bubble up later, where errors can be logged and handled.
_, err := os.Stat("/proc/sys/net/ipv6/conf/default/accept_ra")
if err == nil || !errors.Is(err, os.ErrNotExist) {
res = append(res, []*kernel.Param{
{
Key: "proc.sys.net.ipv6.conf.default.forwarding",
@ -104,6 +107,10 @@ func (ctrl *KernelParamDefaultsController) getKernelParams() []*kernel.Param {
Key: "proc.sys.net.ipv6.conf.default.accept_ra",
Value: "2",
},
}...)
}
res = append(res, []*kernel.Param{
// ipvs/conntrack tcp keepalive refresh.
{
Key: "proc.sys.net.ipv4.tcp_keepalive_time",