🌱 Use dedicated least-privilege service accounts for revision probe e2e tests

test/e2e/features/revision.feature

@@ -5,16 +5,16 @@ Feature: Install ClusterExtensionRevision
 
   Background:
     Given OLM is available
-    And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
 
-  Scenario: Probe failure for PersistentVolumeClaim halts phase progression 
+  Scenario: Probe failure for PersistentVolumeClaim halts phase progression
+    Given ServiceAccount "pvc-probe-sa" with needed permissions is available in test namespace
     When ClusterExtensionRevision is applied
       """
       apiVersion: olm.operatorframework.io/v1
       kind: ClusterExtensionRevision
       metadata:
         annotations:
-          olm.operatorframework.io/service-account-name: olm-sa
+          olm.operatorframework.io/service-account-name: pvc-probe-sa
           olm.operatorframework.io/service-account-namespace: ${TEST_NAMESPACE}
         name: ${CER_NAME}
       spec:
@@ -59,13 +59,14 @@ Feature: Install ClusterExtensionRevision
     And resource "configmap/test-configmap" is not installed
 
   Scenario: Phases progress when PersistentVolumeClaim becomes "Bound"
+    Given ServiceAccount "pvc-probe-sa" with needed permissions is available in test namespace
     When ClusterExtensionRevision is applied
       """
       apiVersion: olm.operatorframework.io/v1
       kind: ClusterExtensionRevision
       metadata:
         annotations:
-          olm.operatorframework.io/service-account-name: olm-sa
+          olm.operatorframework.io/service-account-name: pvc-probe-sa
           olm.operatorframework.io/service-account-namespace: ${TEST_NAMESPACE}
         name: ${CER_NAME}
       spec:

test/e2e/steps/steps.go

@@ -44,9 +44,6 @@ const (
 	olmDeploymentName = "operator-controller-controller-manager"
 	timeout           = 5 * time.Minute
 	tick              = 1 * time.Second
-
-	helmRBACTemplate      = "rbac-template.yaml"
-	boxcutterRBACTemplate = "boxcutter-rbac-template.yaml"
 )
 
 var (
@@ -833,13 +830,13 @@ func ServiceAccountIsAvailableInNamespace(ctx context.Context, serviceAccount st
 }
 
 // ServiceAccountWithNeededPermissionsIsAvailableInNamespace creates a ServiceAccount and applies standard RBAC permissions.
-// The RBAC template is selected based on the BoxcutterRuntime feature gate: the boxcutter applier does not require
-// cluster-scoped list/watch permissions, so a narrower template is used when BoxcutterRuntime is enabled.
+// The RBAC template is selected based on the service account and BoxcutterRuntime feature gate: <service-account>-<helm|boxcutter>-rbac-template.yaml
 func ServiceAccountWithNeededPermissionsIsAvailableInNamespace(ctx context.Context, serviceAccount string) error {
-	rbacTemplate := helmRBACTemplate
+	kernel := "helm"
 	if enabled, found := featureGates[features.BoxcutterRuntime]; found && enabled {
-		rbacTemplate = boxcutterRBACTemplate
+		kernel = "boxcutter"
 	}
+	rbacTemplate := fmt.Sprintf("%s-%s-rbac-template.yaml", serviceAccount, kernel)
 	return applyPermissionsToServiceAccount(ctx, serviceAccount, rbacTemplate)
 }
 

test/e2e/steps/testdata/pvc-probe-sa-boxcutter-rbac-template.yaml

@@ -0,0 +1,51 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-clusterrole
+rules:
+  - apiGroups: [olm.operatorframework.io]
+    resources: [clusterextensionrevisions/finalizers]
+    verbs: [update]
+  - apiGroups: [""]
+    resources: [persistentvolumes]
+    verbs: [create, update, get, delete, patch]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-role
+  namespace: ${TEST_NAMESPACE}
+rules:
+  - apiGroups: [""]
+    resources: [persistentvolumeclaims]
+    verbs: [create, update, get, delete, patch]
+  - apiGroups: [""]
+    resources: [configmaps]
+    verbs: [create, update, get, delete, patch]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-clusterrole
+subjects:
+  - kind: ServiceAccount
+    name: ${SERVICEACCOUNT_NAME}
+    namespace: ${TEST_NAMESPACE}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-binding
+  namespace: ${TEST_NAMESPACE}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ${TEST_NAMESPACE}-${SERVICEACCOUNT_NAME}-role
+subjects:
+  - kind: ServiceAccount
+    name: ${SERVICEACCOUNT_NAME}
+    namespace: ${TEST_NAMESPACE}