Skip to content

Commit

Permalink
fix: append Talos default kernel args even if there is something defined
Browse files Browse the repository at this point in the history
If the server or environment used by the machine had at least one kernel
param overridden, the `ipxe_server` was skipping adding all of them.

Instead of that skip only the parameters which were defined.

Signed-off-by: Artem Chernyshev <artem.chernyshev@talos-systems.com>
  • Loading branch information
Unix4ever committed May 18, 2022
1 parent 6c6b354 commit fd0086d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/sidero-controller-manager/internal/ipxe/ipxe_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ func appendTalosArguments(env *metalv1.Environment) {
logDeliveryPrefix := talosconstants.KernelParamLoggingKernel + "="
eventsSinkPrefix := talosconstants.KernelParamEventsSink + "="

outer:
for _, prefix := range []string{
talosConfigPrefix,
sideroLinkPrefix,
Expand All @@ -505,7 +506,7 @@ func appendTalosArguments(env *metalv1.Environment) {
for _, arg := range args {
if strings.HasPrefix(arg, prefix) {
// Environment already has variable, skip it
return
continue outer
}
}

Expand Down

0 comments on commit fd0086d

Please sign in to comment.