Skip to content

Commit

Permalink
Merge pull request #4046 from ori-amizur/OCPBUGS-23085
Browse files Browse the repository at this point in the history
OCPBUGS-23085: MCO duplicates kernel arguments during firstboot
  • Loading branch information
openshift-merge-bot[bot] committed Dec 13, 2023
2 parents 5d8c005 + dc8e0aa commit 8477a99
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ func (dn *Daemon) RunFirstbootCompleteMachineconfig() error {
// This "false" is a compatibility for IBM's use case, where they are using the MCD to write the full configuration instead of just
// the encapsulated config. This shouldn't affect normal OCP operations, but will allow anyone using this code to write configs to
// still get the kubelet cert
err = dn.update(nil, &mc, false)
err = dn.update(oldConfig, &mc, false)
if err != nil {
return err
}
Expand Down

0 comments on commit 8477a99

Please sign in to comment.