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

AppArmor: support path globs when merging profiles #2239

Merged
merged 1 commit into from
May 14, 2024

Conversation

mhils
Copy link
Contributor

@mhils mhils commented May 3, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR makes spoc merge understand glob patterns in the profile. This improves the UX when merging automatically recorded profiles into hand-maintained ones:

$ cat demo.yml
apiVersion: security-profiles-operator.x-k8s.io/v1alpha1
kind: AppArmorProfile
spec:
  abstract:
    executable:
      allowedExecutables:
      - /sbin/ip{,6}tables-save
$ cat recorded.yml
apiVersion: security-profiles-operator.x-k8s.io/v1alpha1
kind: AppArmorProfile
spec:
  abstract:
    executable:
      allowedExecutables:
      - /sbin/iptables-save
      - /sbin/ip6tables-save
$ build/spoc merge demo.yml recorded.yml
20:14:27.951272 Merging 2 profiles into /tmp/profile.yaml
20:14:27.951288 Reading file demo.yml
20:14:27.951582 Reading file recorded.yml
$ cat /tmp/profile.yaml
apiVersion: security-profiles-operator.x-k8s.io/v1alpha1
kind: AppArmorProfile
metadata:
  creationTimestamp: null
spec:
  abstract:
    executable:
      allowedExecutables:
      - /sbin/ip{,6}tables-save. # no new entries
status: {}

Which issue(s) this PR fixes:

None

Does this PR have test?

Yes.

Special notes for your reviewer:

Does this PR introduce a user-facing change?

`spoc merge` now combines AppArmor profiles with glob patterns in the first profile.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 3, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @mhils. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label May 3, 2024
@k8s-ci-robot k8s-ci-robot requested review from pjbgf and Vincent056 May 3, 2024 18:16
@saschagrunert
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 6, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 6, 2024

Codecov Report

Attention: Patch coverage is 84.93976% with 25 lines in your changes are missing coverage. Please review.

Project coverage is 41.42%. Comparing base (11d77f4) to head (72a56c8).
Report is 174 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2239      +/-   ##
==========================================
- Coverage   45.50%   41.42%   -4.08%     
==========================================
  Files          79      108      +29     
  Lines        7782    15587    +7805     
==========================================
+ Hits         3541     6457    +2916     
- Misses       4099     8664    +4565     
- Partials      142      466     +324     

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 11, 2024
@ccojocar
Copy link
Contributor

/test all

@saschagrunert
Copy link
Member

@mhils please rebase on top of main to get the latest CI fixes in.

@mhils mhils force-pushed the apparmor-merge branch from 72a56c8 to d13243f Compare May 13, 2024 14:57
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2024
@ccojocar
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ccojocar, mhils, 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:
  • OWNERS [ccojocar,saschagrunert]

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

@mhils
Copy link
Contributor Author

mhils commented May 14, 2024

Looks like CI failure are unrelated to the PR and need a restart. :)

@k8s-ci-robot k8s-ci-robot merged commit 3f0979b into kubernetes-sigs:main May 14, 2024
27 checks passed
@mhils mhils deleted the apparmor-merge branch June 20, 2024 15:13
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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants