Add Support for Selinux Profile Binding #854

Vincent056 · 2022-03-22T08:37:10Z

/kind feature

What this PR does / why we need it:

This change updates SPO binding webhook to support SelinuxProfile binding and updates ProfileBinding CRD to allow SelinuxProfile as a profile reference.

Does this PR have test?

Yes

Does this PR introduce a user-facing change?

Yes

Add the ability to use SelinuxProfile when creating profilebinding objects.

linux-foundation-easycla · 2022-03-22T08:37:14Z

The committers listed above are authorized under a signed CLA.

✅ login: Vincent056 / name: Vincent Shen (5e3b442)

k8s-ci-robot · 2022-03-22T08:37:17Z

Welcome @Vincent056!

It looks like this is your first PR to kubernetes-sigs/security-profiles-operator 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/security-profiles-operator has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2022-03-22T08:37:18Z

Hi @Vincent056. 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/test-infra repository.

JAORMX · 2022-03-22T10:45:11Z

/ok-to-test

JAORMX · 2022-03-22T10:45:40Z

Hey @Vincent056 glad to see you're starting to contribute here! Seems the PR has a merge conflict, so you'd need to fix that first.

Vincent056 · 2022-03-22T16:10:12Z

Hey @Vincent056 glad to see you're starting to contribute here! Seems the PR has a merge conflict, so you'd need to fix that first.

I also need to update the workloadannotator controller to handle the finalizer for SelinuxProfile, excited to work on this!

jhrozek · 2022-03-24T15:34:23Z

You'll want to fix the verify issues, see e.g. https://github.com/kubernetes-sigs/security-profiles-operator/runs/5674912566?check_suite_focus=true
locally you can run make verify, warning, your tree must be clean locally (so, no untracked files).
Many issues can be fixed by running golangci-lint run --fix, sometimes repeatedly, sometimes with a little manual help (I found that it screws up imports when sorting them..).

jhrozek · 2022-03-24T15:36:01Z

Not sure why the patch shows up twice in GH, have you rebased atop origin/main (keep in mind that SPO doesn't use master anymore, but main...)

Vincent056 · 2022-04-01T09:24:43Z

The OLM test is failing, I think you need to run make bundle and then commit the results:

+++ b/bundle/manifests/security-profiles-operator.x-k8s.io_rawselinuxprofiles.yaml
@@ -49,6 +49,10 @@ spec:
           status:
             description: SelinuxProfileStatus defines the observed state of SelinuxProfile.
             properties:
+              activeWorkloads:
+                items:
+                  type: string
+                type: array
               conditions:
                 description: Conditions of the resource.
                 items:

Got

FATA[0000] failed to read config: error unmarshalling project configuration: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal array into Go struct field Config.layout of type string

And did not realize I was using the old operator-sdk lol

jhrozek

Thank you, I left some comments inline, I think the PR is getting close!

jhrozek · 2022-04-01T08:40:04Z

internal/pkg/manager/workloadannotator/workloadannotator.go

+		errSeccomp := r.client.List(ctx, seccompProfiles, client.MatchingFields{linkedPodsKey: podID})
+		errSelinux := r.client.List(ctx, selinuxProfiles, client.MatchingFields{linkedPodsKey: podID})
+
+		if errSeccomp != nil && errSelinux != nil {


did you want to use '||' instead of '&&' here?

this was intended, we don't want to continue if we can not list either seccomp profiles or selinux profiles

Right, either. So there should be an OR, right? Otherwise if errSeccomp is non-nil and errSelinux is nil, the condition doesn't match and we continue.

Yes, that's why I have separate check for errSeccomp and errSelinux after that

Oh I get it now, but in case only one of the lists has an error, we don't reconcile again and just ignore the error. Is that OK?

ahh I see, I guess I should use or here instead.

internal/pkg/manager/workloadannotator/workloadannotator.go

jhrozek · 2022-04-01T10:17:02Z

The OLM test is failing, I think you need to run make bundle and then commit the results:

+++ b/bundle/manifests/security-profiles-operator.x-k8s.io_rawselinuxprofiles.yaml
@@ -49,6 +49,10 @@ spec:
           status:
             description: SelinuxProfileStatus defines the observed state of SelinuxProfile.
             properties:
+              activeWorkloads:
+                items:
+                  type: string
+                type: array
               conditions:
                 description: Conditions of the resource.
                 items:

Got

FATA[0000] failed to read config: error unmarshalling project configuration: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal array into Go struct field Config.layout of type string

And did not realize I was using the old operator-sdk lol

The OLM test is failing, I think you need to run make bundle and then commit the results:

+++ b/bundle/manifests/security-profiles-operator.x-k8s.io_rawselinuxprofiles.yaml
@@ -49,6 +49,10 @@ spec:
           status:
             description: SelinuxProfileStatus defines the observed state of SelinuxProfile.
             properties:
+              activeWorkloads:
+                items:
+                  type: string
+                type: array
               conditions:
                 description: Conditions of the resource.
                 items:

Got

FATA[0000] failed to read config: error unmarshalling project configuration: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal array into Go struct field Config.layout of type string

And did not realize I was using the old operator-sdk lol

SPO should be using operator-sdk from ./build not the system-wide one or the one in GOPATH, if it is, we might have a bug somewhere in the Makefiles where we don't call the right binary.

Vincent056 · 2022-04-01T17:32:43Z

/retest

jhrozek · 2022-04-01T17:59:31Z

Looks good except the one comment about the AND vs OR. In the meantime, @saschagrunert can you please allow GH actions to be ran? I can't seem to be able to do it

Vincent056 · 2022-04-04T20:27:29Z

Sorry to bug again, wondering if anyone could approve the GH action workflows to run?, @saschagrunert @jhrozek Thanks

internal/pkg/manager/workloadannotator/workloadannotator.go

test/tc_selinux_profilebindings_test.go

This change updates binding webhook to support SelinuxProfile binding and updates ProfileBinding to allow SelinuxProfile as profile reference.

saschagrunert · 2022-04-05T14:47:33Z

/retest

jhrozek

/lgtm
awesome work, thank you for the patience during the review!

k8s-ci-robot · 2022-04-06T08:35:31Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhrozek, Vincent056

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~~ [jhrozek]

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 added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 22, 2022

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 22, 2022

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 22, 2022

k8s-ci-robot requested review from cmurphy and JAORMX March 22, 2022 08:37

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 22, 2022

Vincent056 force-pushed the selinux branch from 5e3b442 to 82d562d Compare March 22, 2022 08:43

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 Mar 22, 2022

Vincent056 force-pushed the selinux branch from 82d562d to 84cc07c Compare March 24, 2022 09:06

Vincent056 force-pushed the selinux branch 3 times, most recently from d50a2e6 to 2e00f70 Compare March 24, 2022 10:29

jhrozek reviewed Apr 1, 2022

View reviewed changes

Vincent056 force-pushed the selinux branch 2 times, most recently from 094ae59 to d9646cf Compare April 1, 2022 11:43

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 4, 2022

Vincent056 force-pushed the selinux branch from d9646cf to 8a86b1c Compare April 4, 2022 19:27

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 4, 2022

Vincent056 force-pushed the selinux branch 4 times, most recently from afbaa43 to d1bdaca Compare April 4, 2022 19:59

Vincent056 force-pushed the selinux branch 2 times, most recently from e79bde3 to 5623351 Compare April 5, 2022 08:53

jhrozek reviewed Apr 5, 2022

View reviewed changes

internal/pkg/manager/workloadannotator/workloadannotator.go Outdated Show resolved Hide resolved

jhrozek reviewed Apr 5, 2022

View reviewed changes

test/tc_selinux_profilebindings_test.go Outdated Show resolved Hide resolved

Add Support for Selinux Profile Binding

3ac4795

This change updates binding webhook to support SelinuxProfile binding and updates ProfileBinding to allow SelinuxProfile as profile reference.

Vincent056 force-pushed the selinux branch from 5623351 to 3ac4795 Compare April 5, 2022 14:31

jhrozek approved these changes Apr 6, 2022

View reviewed changes

k8s-ci-robot assigned jhrozek Apr 6, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2022

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2022

k8s-ci-robot merged commit f4a6c6a into kubernetes-sigs:main Apr 6, 2022

Vincent056 mentioned this pull request Apr 6, 2022

Reduce code duplication in workloadannotator #887

Closed

Vincent056 mentioned this pull request Oct 21, 2022

REQUEST: New membership for Vincent056 kubernetes/org#3783

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Support for Selinux Profile Binding #854

Add Support for Selinux Profile Binding #854

Vincent056 commented Mar 22, 2022

linux-foundation-easycla bot commented Mar 22, 2022 •

edited

Loading

k8s-ci-robot commented Mar 22, 2022

k8s-ci-robot commented Mar 22, 2022

JAORMX commented Mar 22, 2022

JAORMX commented Mar 22, 2022

Vincent056 commented Mar 22, 2022

jhrozek commented Mar 24, 2022

jhrozek commented Mar 24, 2022

Vincent056 commented Apr 1, 2022

jhrozek left a comment

jhrozek Apr 1, 2022

Vincent056 Apr 1, 2022

jhrozek Apr 1, 2022

Vincent056 Apr 1, 2022

jhrozek Apr 4, 2022

Vincent056 Apr 4, 2022

jhrozek commented Apr 1, 2022

Vincent056 commented Apr 1, 2022

jhrozek commented Apr 1, 2022

Vincent056 commented Apr 4, 2022

saschagrunert commented Apr 5, 2022

jhrozek left a comment

k8s-ci-robot commented Apr 6, 2022

Add Support for Selinux Profile Binding #854

Add Support for Selinux Profile Binding #854

Conversation

Vincent056 commented Mar 22, 2022

What this PR does / why we need it:

Does this PR have test?

Does this PR introduce a user-facing change?

linux-foundation-easycla bot commented Mar 22, 2022 • edited Loading

k8s-ci-robot commented Mar 22, 2022

k8s-ci-robot commented Mar 22, 2022

JAORMX commented Mar 22, 2022

JAORMX commented Mar 22, 2022

Vincent056 commented Mar 22, 2022

jhrozek commented Mar 24, 2022

jhrozek commented Mar 24, 2022

Vincent056 commented Apr 1, 2022

jhrozek left a comment

Choose a reason for hiding this comment

jhrozek Apr 1, 2022

Choose a reason for hiding this comment

Vincent056 Apr 1, 2022

Choose a reason for hiding this comment

jhrozek Apr 1, 2022

Choose a reason for hiding this comment

Vincent056 Apr 1, 2022

Choose a reason for hiding this comment

jhrozek Apr 4, 2022

Choose a reason for hiding this comment

Vincent056 Apr 4, 2022

Choose a reason for hiding this comment

jhrozek commented Apr 1, 2022

Vincent056 commented Apr 1, 2022

jhrozek commented Apr 1, 2022

Vincent056 commented Apr 4, 2022

saschagrunert commented Apr 5, 2022

jhrozek left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 6, 2022

linux-foundation-easycla bot commented Mar 22, 2022 •

edited

Loading