Add Support for Selinux Profile Binding

api/profilebinding/v1alpha1/profilebinding_types.go

@@ -24,6 +24,7 @@ type ProfileBindingKind string
 
 const (
 	ProfileBindingKindSeccompProfile ProfileBindingKind = "SeccompProfile"
+	ProfileBindingKindSelinuxProfile ProfileBindingKind = "SelinuxProfile"
 )
 
 // ProfileBindingSpec defines the desired state of ProfileBinding.
@@ -37,7 +38,7 @@ type ProfileBindingSpec struct {
 // ProfileRef contains information that points to the profile being used.
 type ProfileRef struct {
 	// Kind of object to be bound.
-	// +kubebuilder:validation:Enum=SeccompProfile
+	// +kubebuilder:validation:Enum=SeccompProfile;SelinuxProfile
 	Kind ProfileBindingKind `json:"kind"` // TODO(cmurphy) add SelinuxProfile
 	// Name of the profile within the current namespace to which to bind the selected pods.
 	Name string `json:"name"`

api/selinuxprofile/v1alpha2/selinuxprofile_types.go

@@ -73,7 +73,8 @@ type SelinuxProfileStatus struct {
 	profilebasev1alpha1.StatusBase `json:",inline"`
 	// Represents the string that the SelinuxProfile object can be
 	// referenced as in a pod seLinuxOptions section.
-	Usage string `json:"usage,omitempty"`
+	Usage           string   `json:"usage,omitempty"`
+	ActiveWorkloads []string `json:"activeWorkloads,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

bundle/manifests/security-profiles-operator.x-k8s.io_profilebindings.yaml

@@ -47,6 +47,7 @@ spec:
                     description: Kind of object to be bound.
                     enum:
                     - SeccompProfile
+                    - SelinuxProfile
                     type: string
                   name:
                     description: Name of the profile within the current namespace

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:

bundle/manifests/security-profiles-operator.x-k8s.io_selinuxprofiles.yaml

@@ -81,6 +81,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:

bundle/manifests/spo-webhook_rbac.authorization.k8s.io_v1_clusterrole.yaml

@@ -89,3 +89,11 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - security-profiles-operator.x-k8s.io
+  resources:
+  - selinuxprofiles
+  verbs:
+  - get
+  - list
+  - watch

cmd/security-profiles-operator/main.go

@@ -473,6 +473,9 @@ func runWebhook(ctx *cli.Context, info *version.Info) error {
 	if err := seccompprofileapi.AddToScheme(mgr.GetScheme()); err != nil {
 		return fmt.Errorf("add seccompprofile API to scheme: %w", err)
 	}
+	if err := selxv1alpha2.AddToScheme(mgr.GetScheme()); err != nil {
+		return fmt.Errorf("add selinuxprofile API to scheme: %w", err)
+	}
 	if err := profilerecording1alpha1.AddToScheme(mgr.GetScheme()); err != nil {
 		return fmt.Errorf("add profilerecording API to scheme: %w", err)
 	}

deploy/base/crd.yaml

@@ -505,6 +505,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:

deploy/base/crds/profilebinding.yaml

@@ -45,6 +45,7 @@ spec:
                     description: Kind of object to be bound.
                     enum:
                     - SeccompProfile
+                    - SelinuxProfile
                     type: string
                   name:
                     description: Name of the profile within the current namespace

deploy/base/crds/selinuxpolicy.yaml

@@ -47,6 +47,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:
@@ -184,6 +188,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:

deploy/base/role.yaml

@@ -544,6 +544,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - security-profiles-operator.x-k8s.io
+  resources:
+  - selinuxprofiles
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

deploy/namespace-operator.yaml

@@ -47,6 +47,7 @@ spec:
                     description: Kind of object to be bound.
                     enum:
                     - SeccompProfile
+                    - SelinuxProfile
                     type: string
                   name:
                     description: Name of the profile within the current namespace
@@ -776,6 +777,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:
@@ -915,6 +920,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:
@@ -1617,6 +1626,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - security-profiles-operator.x-k8s.io
+  resources:
+  - selinuxprofiles
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

deploy/openshift-dev.yaml

@@ -47,6 +47,7 @@ spec:
                     description: Kind of object to be bound.
                     enum:
                     - SeccompProfile
+                    - SelinuxProfile
                     type: string
                   name:
                     description: Name of the profile within the current namespace
@@ -776,6 +777,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:
@@ -915,6 +920,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:
@@ -1617,6 +1626,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - security-profiles-operator.x-k8s.io
+  resources:
+  - selinuxprofiles
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

deploy/operator.yaml

@@ -47,6 +47,7 @@ spec:
                     description: Kind of object to be bound.
                     enum:
                     - SeccompProfile
+                    - SelinuxProfile
                     type: string
                   name:
                     description: Name of the profile within the current namespace
@@ -776,6 +777,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:
@@ -915,6 +920,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:
@@ -1617,6 +1626,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - security-profiles-operator.x-k8s.io
+  resources:
+  - selinuxprofiles
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

internal/pkg/manager/workloadannotator/setup.go

@@ -28,6 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	seccompprofileapi "sigs.k8s.io/security-profiles-operator/api/seccompprofile/v1beta1"
+	selinuxprofileapi "sigs.k8s.io/security-profiles-operator/api/selinuxprofile/v1alpha2"
 	"sigs.k8s.io/security-profiles-operator/internal/pkg/daemon/metrics"
 )
 
@@ -53,23 +54,47 @@ func (r *PodReconciler) Setup(
 		return fmt.Errorf("creating pod index: %w", err)
 	}
 
+	// Index Pods using selinux profiles
+	if err := mgr.GetFieldIndexer().IndexField(ctx, &corev1.Pod{}, seOwnerKey, func(rawObj client.Object) []string {
+		pod, ok := rawObj.(*corev1.Pod)
+		if !ok {
+			return []string{}
+		}
+		return getSelinuxProfilesFromPod(r, pod)
+	}); err != nil {
+		return fmt.Errorf("creating pod index: %w", err)
+	}
+
 	// Index SeccompProfiles with active pods
 	if err := mgr.GetFieldIndexer().IndexField(
 		ctx, &seccompprofileapi.SeccompProfile{}, linkedPodsKey, func(rawObj client.Object) []string {
 			sp, ok := rawObj.(*seccompprofileapi.SeccompProfile)
 			if !ok {
 				return []string{}
 			}
+
 			return sp.Status.ActiveWorkloads
 		}); err != nil {
 		return fmt.Errorf("creating seccomp profile index: %w", err)
 	}
 
+	// Index SelinuxProfile with active pods
+	if err := mgr.GetFieldIndexer().IndexField(
+		ctx, &selinuxprofileapi.SelinuxProfile{}, linkedPodsKey, func(rawObj client.Object) []string {
+			sp, ok := rawObj.(*selinuxprofileapi.SelinuxProfile)
+			if !ok {
+				return []string{}
+			}
+			return sp.Status.ActiveWorkloads
+		}); err != nil {
+		return fmt.Errorf("creating selinux profile index: %w", err)
+	}
+
 	// Register a special reconciler for pod events
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(name).
 		For(&corev1.Pod{}).
-		WithEventFilter(resource.NewPredicates(hasSeccompProfile)).
+		WithEventFilter(resource.NewPredicates(r.hasValidProfile)).
 		Complete(r)
 }
 
@@ -81,3 +106,16 @@ func hasSeccompProfile(obj runtime.Object) bool {
 
 	return len(getSeccompProfilesFromPod(pod)) > 0
 }
+
+func hasSelinuxProfile(r *PodReconciler, obj runtime.Object) bool {
+	pod, ok := obj.(*corev1.Pod)
+	if !ok {
+		return false
+	}
+
+	return len(getSelinuxProfilesFromPod(r, pod)) > 0
+}
+
+func (r *PodReconciler) hasValidProfile(obj runtime.Object) bool {
+	return hasSeccompProfile(obj) || hasSelinuxProfile(r, obj)
+}