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

Drop support for path based seccomp profiles #7006

Merged
merged 1 commit into from Jun 19, 2023

Conversation

saschagrunert
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Field based profiles should be standard since many Kubernetes releases, means we can drop the path based logic and cleanup some code.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Dropped support for annotation based seccomp profiles, Kubernetes uses a native field since many releases.

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 1, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 1, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2023
@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Merging #7006 (75aacdb) into main (56a7e3a) will decrease coverage by 0.02%.
The diff coverage is 45.45%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7006      +/-   ##
==========================================
- Coverage   49.21%   49.19%   -0.02%     
==========================================
  Files         132      132              
  Lines       15381    15334      -47     
==========================================
- Hits         7569     7544      -25     
+ Misses       6909     6895      -14     
+ Partials      903      895       -8     

@saschagrunert
Copy link
Member Author

For critest this requires kubernetes-sigs/cri-tools#1181

@saschagrunert saschagrunert force-pushed the seccomp branch 7 times, most recently from 9a0bc39 to 4c6eff3 Compare June 2, 2023 08:22
Field based profiles should be standard since many Kubernetes releases,
means we can drop the path based logic and cleanup some code.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert saschagrunert marked this pull request as ready for review June 2, 2023 08:37
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2023
@openshift-ci openshift-ci bot requested review from klihub and wgahnagl June 2, 2023 08:38
@saschagrunert
Copy link
Member Author

@sohankunkerkar looks like it's still using critest v1.27.0, do you have any idea how we can switch to master?

@sohankunkerkar
Copy link
Member

sohankunkerkar commented Jun 2, 2023

@sohankunkerkar looks like it's still using critest v1.27.0, do you have any idea how we can switch to master?

We should merge this change as-is because the CI cache images still rely on v1.27.0. Alternatively, you can submit a different pull request by modifying the cri_tools_git_version.

@haircommander
Copy link
Member

would you mind also tying in dropping traces of seccomp_default_when_empty or does that feel out of scope?

@@ -12,7 +12,7 @@ build_kata: False
cgroupv2: False

critest_mirror_repo: quay.io/crio
cri_tools_git_version: "v1.27.0"
cri_tools_git_version: master
Copy link
Contributor

Choose a reason for hiding this comment

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

any way this can be converted to "main"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, when we agree on kubernetes-sigs/cri-tools#1100

@saschagrunert
Copy link
Member Author

would you mind also tying in dropping traces of seccomp_default_when_empty or does that feel out of scope?

I was thinking about it and re-added the behavior for the path based profiles in:
https://github.com/cri-o/cri-o/pull/7006/files#diff-824bf5b0cfe0c703e0eaac741045e010bc8b20297184bef4ab47d0e7d44c3b48R190

I can follow-up on that PR and remove the feature since it's deprecated for a while now.

@saschagrunert
Copy link
Member Author

@cri-o/ocicni-maintainers PTAL

@haircommander
Copy link
Member

critest will fail until a new image is built

/override ci/prow/ci-fedora-critest
/override ci/prow/ci-rhel-critest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2023

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/ci-fedora-critest, ci/prow/ci-rhel-critest

In response to this:

critest will fail until a new image is built

/override ci/prow/ci-fedora-critest
/override ci/prow/ci-rhel-critest
/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@saschagrunert
Copy link
Member Author

/override ci/prow/ci-fedora-critest
/override ci/prow/ci-rhel-critest
/test ci-fedora-integration
/test e2e-gcp-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 19, 2023

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-fedora-critest, ci/prow/ci-rhel-critest

In response to this:

/override ci/prow/ci-fedora-critest
/override ci/prow/ci-rhel-critest
/test ci-fedora-integration
/test e2e-gcp-ovn

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@saschagrunert
Copy link
Member Author

/test e2e-gcp-ovn

@saschagrunert
Copy link
Member Author

/override ci/prow/e2e-gcp-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 19, 2023

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-gcp-ovn

In response to this:

/override ci/prow/e2e-gcp-ovn

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot merged commit 24dba8f into cri-o:main Jun 19, 2023
62 of 64 checks passed
@saschagrunert saschagrunert deleted the seccomp branch June 19, 2023 14:45
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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants