Skip to content

CNTRLPLANE-1544: tests: authorization/rbac: Add restricted-v3 scc #30384

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 24, 2025
+15 −0
Merged

CNTRLPLANE-1544: tests: authorization/rbac: Add restricted-v3 scc #30384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions test/extended/authorization/rbac/groups_default_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
apierrors "k8s.io/apimachinery/pkg/api/errors"

corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down Expand Up @@ -125,6 +126,8 @@ var (
rbacv1helpers.NewRule("list", "watch").Groups(projectGroup, legacyProjectGroup).Resources("projects").RuleOrDie(),

rbacv1helpers.NewRule("use").Groups(security.GroupName).Resources("securitycontextconstraints").Names("restricted-v2").RuleOrDie(),
// TODO: Uncomment this once https://github.com/openshift/cluster-kube-apiserver-operator/pull/1944 is merged.
// rbacv1helpers.NewRule("use").Groups(security.GroupName).Resources("securitycontextconstraints").Names("restricted-v3").RuleOrDie(),

// TODO: remove when openshift-apiserver has removed these
rbacv1helpers.NewRule("get").URLs(
Expand Down Expand Up @@ -243,6 +246,18 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] The default clust
exutil.FatalErr("failed to sync RBAC cache")
}

// Temporary fix for https://github.com/openshift/cluster-kube-apiserver-operator/pull/1944
// Add a rule for restricted-v3 to the list in case the associated ClusterRoleBinding exists.
// TODO: Remove the following block once merged.
if _, err := kubeInformers.Rbac().V1().ClusterRoleBindings().Lister().Get("system:openshift:scc:restricted-v3"); err != nil {
if !apierrors.IsNotFound(err) {
o.Expect(err).NotTo(o.HaveOccurred())
}
} else {
allAuthenticatedRules = append(allAuthenticatedRules,
rbacv1helpers.NewRule("use").Groups(security.GroupName).Resources("securitycontextconstraints").Names("restricted-v3").RuleOrDie())
}

namespaces, err := oc.AdminKubeClient().CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
if err != nil {
exutil.FatalErr(err)
Expand Down