Update kernel args on firstboot-complete#1942
Update kernel args on firstboot-complete#1942openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Conversation
This commits ensures kernel args modifications from /etc/pivot/kernel-args are being applied on both pivot and firstboot_complete_machineconfig. OKD requires this so that "mitigations" karg could be removed from cmdline, as MachineConfig's `kernelArguments` doesn't support removing existing arguments.
e00db5e to
8eb1010
Compare
|
/approve |
|
This is strongly related to #1925 OK right, I understand this now. I think what would be a lot simpler and get us away from the But for now |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, LorbusChris, vrutkovs The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
We'd need to include hyperthreading off case for RHCOS too (its not widely used though) |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
| return errors.Wrap(err, "failed to rename encapsulated MachineConfig after processing on firstboot") | ||
| } | ||
|
|
||
| tuningChanged, err := UpdateTuningArgs(KernelTuningFile, CmdLineFile) |
There was a problem hiding this comment.
A bit late to see this PR. Having this functionality here is going to work only during firstboot. Isn't it that users who maybe using this functionality would want to add/delete these kargs later on as well? Since, these are not applied using MachineConfig, there is no standard way to undo changes done during firstboot.
There was a problem hiding this comment.
Right, removing default kargs via MCs should be solved in https://issues.redhat.com/browse/GRPA-2490
There was a problem hiding this comment.
sorry for the noise, I missed that we already do it at https://github.com/openshift/machine-config-operator/pull/1942/files#diff-06b532a2a5a5d3ad1d5341b3e00945efR547
This commits ensures kernel args modifications from /etc/pivot/kernel-args
are being applied on both pivot and firstboot_complete_machineconfig. Currently its only applied on bootstrap (which uses
pivot), but not on masters/workers. In order to archieve that kargs tuning logic is moved fromcmd/package topkg/daemon.OKD requires this so that "mitigations" karg could be removed from cmdline,
as MachineConfig's
kernelArgumentsdoesn't support removing existing arguments. This should also affect OCP with HyperThreading off, as machineconfigs for that still use/etc/pivot/kernel-args