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

fix: ignore kernel command line in container mode

Browse Source 
Ignore kernel command line for `SideroLink` and `EventsSink` config when
running in container mode. Otherwise when running Talos as a docker
container in Talos it picks up the host kernel cmdline and try to
configure SideroLink/EventsSink.

Signed-off-by: Noel Georgi <git@frezbo.dev>
This commit is contained in:
Noel Georgi 2023-11-21 18:55:37 +05:30
parent 020a0eb63e
commit aca8b5e179
No known key found for this signature in database
GPG Key ID: 21A9F444075C9E36
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/machined/pkg/controllers/runtime/events_sink_config.go
View File

@ -15,6 +15,7 @@ import (
"github.com/siderolabs/go-procfs/procfs" "github.com/siderolabs/go-procfs/procfs"
"go.uber.org/zap" "go.uber.org/zap"
v1alpha1runtime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
"github.com/siderolabs/talos/pkg/machinery/constants" "github.com/siderolabs/talos/pkg/machinery/constants"
"github.com/siderolabs/talos/pkg/machinery/resources/config" "github.com/siderolabs/talos/pkg/machinery/resources/config"
"github.com/siderolabs/talos/pkg/machinery/resources/runtime" "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
@ -22,7 +23,8 @@ import (
// EventsSinkConfigController generates configuration for kmsg log delivery. // EventsSinkConfigController generates configuration for kmsg log delivery.
type EventsSinkConfigController struct { type EventsSinkConfigController struct {
Cmdline *procfs.Cmdline Cmdline *procfs.Cmdline
V1Alpha1Mode v1alpha1runtime.Mode
} }
// Name implements controller.Controller interface. // Name implements controller.Controller interface.
@ -65,7 +67,7 @@ func (ctrl *EventsSinkConfigController) Run(ctx context.Context, r controller.Ru
var endpoint string var endpoint string
if ctrl.Cmdline != nil { if ctrl.Cmdline != nil && ctrl.V1Alpha1Mode != v1alpha1runtime.ModeContainer {
if val := ctrl.Cmdline.Get(constants.KernelParamEventsSink).First(); val != nil { if val := ctrl.Cmdline.Get(constants.KernelParamEventsSink).First(); val != nil {
endpoint = *val endpoint = *val
} }

8
internal/app/machined/pkg/controllers/siderolink/config.go
View File

@ -15,6 +15,7 @@ import (
"github.com/siderolabs/go-procfs/procfs" "github.com/siderolabs/go-procfs/procfs"
"go.uber.org/zap" "go.uber.org/zap"
v1alpha1runtime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
"github.com/siderolabs/talos/pkg/machinery/constants" "github.com/siderolabs/talos/pkg/machinery/constants"
"github.com/siderolabs/talos/pkg/machinery/resources/config" "github.com/siderolabs/talos/pkg/machinery/resources/config"
"github.com/siderolabs/talos/pkg/machinery/resources/siderolink" "github.com/siderolabs/talos/pkg/machinery/resources/siderolink"
@ -22,7 +23,8 @@ import (
// ConfigController interacts with SideroLink API and brings up the SideroLink Wireguard interface. // ConfigController interacts with SideroLink API and brings up the SideroLink Wireguard interface.
type ConfigController struct { type ConfigController struct {
Cmdline *procfs.Cmdline Cmdline *procfs.Cmdline
V1Alpha1Mode v1alpha1runtime.Mode
} }
// Name implements controller.Controller interface. // Name implements controller.Controller interface.
@ -89,6 +91,10 @@ func (ctrl *ConfigController) apiEndpoint(machineConfig *config.MachineConfig) s
return machineConfig.Config().SideroLink().APIUrl().String() return machineConfig.Config().SideroLink().APIUrl().String()
} }
if ctrl.V1Alpha1Mode == v1alpha1runtime.ModeContainer {
return ""
}
if ctrl.Cmdline == nil || ctrl.Cmdline.Get(constants.KernelParamSideroLink).First() == nil { if ctrl.Cmdline == nil || ctrl.Cmdline.Get(constants.KernelParamSideroLink).First() == nil {
return "" return ""
} }

6
internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go
View File

@ -244,7 +244,8 @@ func (ctrl *Controller) Run(ctx context.Context, drainer *runtime.Drainer) error
MetaProvider: ctrl.v1alpha1Runtime.State().Machine(), MetaProvider: ctrl.v1alpha1Runtime.State().Machine(),
}, },
&runtimecontrollers.EventsSinkConfigController{ &runtimecontrollers.EventsSinkConfigController{
Cmdline: procfs.ProcCmdline(), Cmdline: procfs.ProcCmdline(),
V1Alpha1Mode: ctrl.v1alpha1Runtime.State().Platform().Mode(),
}, },
&runtimecontrollers.EventsSinkController{ &runtimecontrollers.EventsSinkController{
V1Alpha1Events: ctrl.v1alpha1Runtime.Events(), V1Alpha1Events: ctrl.v1alpha1Runtime.Events(),
@ -297,7 +298,8 @@ func (ctrl *Controller) Run(ctx context.Context, drainer *runtime.Drainer) error
secrets.NewRootOSController(), secrets.NewRootOSController(),
&secrets.TrustdController{}, &secrets.TrustdController{},
&siderolink.ConfigController{ &siderolink.ConfigController{
Cmdline: procfs.ProcCmdline(), Cmdline: procfs.ProcCmdline(),
V1Alpha1Mode: ctrl.v1alpha1Runtime.State().Platform().Mode(),
}, },
&siderolink.ManagerController{}, &siderolink.ManagerController{},
&timecontrollers.AdjtimeStatusController{ &timecontrollers.AdjtimeStatusController{