Skip to content
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.

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

Fix seccomp value in test #1236

Merged
merged 1 commit into from
Aug 10, 2023

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Aug 10, 2023

What type of PR is this?

/kind regression

What this PR does / why we need it:

The seccomp value should be 2 rather than 1. The test succeeded because we also have the value Seccomp_filters which gets matched by "ecc", too. We now check for "Seccomp:" to actually match the right field.

Which issue(s) this PR fixes:

Refers to https://github.com/kubernetes-sigs/cri-tools/pull/1181/files#r1288562050

Special notes for your reviewer:

The field was always Seccomp: since torvalds/linux@2f4b3bf and has never changed.

The Seccomp_filters: field has been added in torvalds/linux@c818c03

Does this PR introduce a user-facing change?

Fixed seccomp filter regression for test "should support seccomp default on the container".

@k8s-ci-robot k8s-ci-robot added kind/regression Categorizes issue or PR as related to a regression from a prior release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 10, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 10, 2023
@saschagrunert saschagrunert force-pushed the seccomp-filter branch 3 times, most recently from bed9a6b to 4c46c79 Compare August 10, 2023 07:45
saschagrunert added a commit to saschagrunert/kubernetes that referenced this pull request Aug 10, 2023
The tests have been introduced in
kubernetes@ca7be7d
and checked for `ecc` in `/proc/self/status` since its creation.

We got a new field `Seccomp_filters:` with the Linux commit
torvalds/linux@c818c03,
means that `ecc` would now match both and interfere with possible test
results depending on the host.

The field `Seccomp:` got introduced in
torvalds/linux@2f4b3bf
and has never changed since then, means we can use it directly to make
the tests more strict.

Refers to kubernetes-sigs/cri-tools#1236

Signed-off-by: Sascha Grunert <[email protected]>
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 10, 2023
The seccomp value should be `2` rather than `1`. The test succeeded
because we also have the value `Seccomp_filters` which gets matched by
"ecc", too. We now check for "Seccomp:" to actually match the right
field.

Signed-off-by: Sascha Grunert <[email protected]>
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert, SergeyKanzhelev

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 86640c5 into kubernetes-sigs:master Aug 10, 2023
21 checks passed
@saschagrunert saschagrunert deleted the seccomp-filter branch August 10, 2023 16:39
maaoBit pushed a commit to maaoBit/kubernetes that referenced this pull request Aug 20, 2024
The tests have been introduced in
kubernetes@ca7be7d
and checked for `ecc` in `/proc/self/status` since its creation.

We got a new field `Seccomp_filters:` with the Linux commit
torvalds/linux@c818c03,
means that `ecc` would now match both and interfere with possible test
results depending on the host.

The field `Seccomp:` got introduced in
torvalds/linux@2f4b3bf
and has never changed since then, means we can use it directly to make
the tests more strict.

Refers to kubernetes-sigs/cri-tools#1236

Signed-off-by: Sascha Grunert <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants