Skip to content

[release-4.22] OCPBUGS-85124: use --delete-if-present for karg removal #6007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+9 −6
Open

[release-4.22] OCPBUGS-85124: use --delete-if-present for karg removal #6007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,8 +1733,11 @@ func generateKargs(oldKernelArguments, newKernelArguments []string) []string {
// kernel arguments which have been applied by MCO previously and append all of the
// kernel arguments present in the new rendered MachineConfig.
// See https://bugzilla.redhat.com/show_bug.cgi?id=1866546#c10.
// Use --delete-if-present instead of --delete to tolerate drift between
// the old MachineConfig spec and the actual state.
// See https://issues.redhat.com/browse/OCPBUGS-75894.
for _, arg := range oldKargs {
cmdArgs = append(cmdArgs, "--delete="+arg)
cmdArgs = append(cmdArgs, "--delete-if-present="+arg)
}
for _, arg := range newKargs {
cmdArgs = append(cmdArgs, "--append="+arg)
Expand Down
10 changes: 5 additions & 5 deletions pkg/daemon/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,29 +301,29 @@ func TestKernelAguments(t *testing.T) {
{
oldKargs: []string{"hello=world"},
newKargs: nil,
out: []string{"--delete=hello=world"},
out: []string{"--delete-if-present=hello=world"},
},
{
oldKargs: []string{"foo", "bar=1", "hello=world"},
newKargs: []string{"hello=world"},
out: []string{"--delete=foo", "--delete=bar=1", "--delete=hello=world", "--append=hello=world"},
out: []string{"--delete-if-present=foo", "--delete-if-present=bar=1", "--delete-if-present=hello=world", "--append=hello=world"},
},
{
oldKargs: []string{"foo", "bar=1 hello=world", "baz"},
newKargs: []string{"foo", "bar=1", "hello=world"},
out: []string{"--delete=foo", "--delete=bar=1", "--delete=hello=world", "--delete=baz",
out: []string{"--delete-if-present=foo", "--delete-if-present=bar=1", "--delete-if-present=hello=world", "--delete-if-present=baz",
"--append=foo", "--append=bar=1", "--append=hello=world"},
},
{
oldKargs: []string{" baz=test bar=\"hello world\""},
newKargs: []string{" baz=test bar=\"hello world\"", "foo"},
out: []string{"--delete=baz=test", "--delete=bar=\"hello world\"",
out: []string{"--delete-if-present=baz=test", "--delete-if-present=bar=\"hello world\"",
"--append=baz=test", "--append=bar=\"hello world\"", "--append=foo"},
},
{
oldKargs: []string{"hugepagesz=1G hugepages=4", "hugepagesz=2M hugepages=4"},
newKargs: []string{"hugepagesz=1G hugepages=4", "hugepagesz=2M hugepages=6"},
out: []string{"--delete=hugepagesz=1G", "--delete=hugepages=4", "--delete=hugepagesz=2M", "--delete=hugepages=4",
out: []string{"--delete-if-present=hugepagesz=1G", "--delete-if-present=hugepages=4", "--delete-if-present=hugepagesz=2M", "--delete-if-present=hugepages=4",
"--append=hugepagesz=1G", "--append=hugepages=4", "--append=hugepagesz=2M", "--append=hugepages=6"},
},
}
Expand Down