fix(adaptation): record sysctl removal markers in Linux.Sysctl#300
Open
thc1006 wants to merge 1 commit into
Open
fix(adaptation): record sysctl removal markers in Linux.Sysctl#300thc1006 wants to merge 1 commit into
thc1006 wants to merge 1 commit into
Conversation
adjustSysctl recorded sysctl removal markers in the Annotations map instead of Linux.Sysctl in its final (pure-removal) loop, so a plugin's sysctl removal was not propagated to the container spec and a spurious annotation-removal marker was produced. Write the marker to Linux.Sysctl, matching the set-and-remove branch earlier in the same function. Signed-off-by: Hsiu-Chi Tsai <84045975+thc1006@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does
adjustSysctlrecords sysctl removal markers in the wrong map. In its final loop over pure removals it writes toAnnotations:The set-and-remove branch earlier in the same function already writes the correct map (
r.reply.adjust.Linux.Sysctl[MarkForRemoval(k)] = ""), andadjustAnnotationsis the function that legitimately writesAnnotations. As written, a plugin's pure sysctl removal is not propagated to the container spec (generate.AdjustSysctlnever sees the marker) and a spurious annotation-removal marker is emitted instead. This changes the final loop to writeLinux.Sysctl.On testing
I did not add a dedicated test here. Unlike annotations and mounts, sysctl removal is not exposed through a plugin-facing adjustment method (there is
SetLinuxSysctlbut noRemoveLinuxSysctl), so the removal-collection path is not exercised by the existing plugin-facing suite inadaptation_suite_test.go. The existing suite still passes (go test ./pkg/adaptation/). I am happy to follow up with aRemoveLinuxSysctlhelper plus a removal test, or a focused test againstadjustSysctl, whichever you prefer.Notes
Verified with
go build,go vet,gofmt, and the existing./pkg/adaptation/tests.