Skip to content

SREP-1565 - Remove cluster-admins exception from namespaces webhook #387

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
Aug 13, 2025
Merged

SREP-1565 - Remove cluster-admins exception from namespaces webhook #387

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions pkg/webhooks/namespace/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const (
layeredProductNamespace string = `^redhat-.*`
layeredProductAdminGroupName string = "layered-sre-cluster-admins"
docString string = `Managed OpenShift Customers may not modify namespaces specified in the %v ConfigMaps because customer workloads should be placed in customer-created namespaces. Customers may not create namespaces identified by this regular expression %s because it could interfere with critical DNS resolution. Additionally, customers may not set or change the values of these Namespace labels %s.`
clusterAdminGroup string = "cluster-admins"
)

// exported vars to be used across packages
Expand Down Expand Up @@ -338,7 +337,7 @@ func NewWebhook() *NamespaceWebhook {
}

func amIAdmin(request admissionctl.Request) bool {
if slices.Contains(clusterAdminUsers, request.UserInfo.Username) || slices.Contains(request.UserInfo.Groups, clusterAdminGroup) {
if slices.Contains(clusterAdminUsers, request.UserInfo.Username) {
return true
}

Expand Down
43 changes: 11 additions & 32 deletions pkg/webhooks/namespace/namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,13 +717,13 @@ func TestAdminUser(t *testing.T) {
shouldBeAllowed: true,
},
{
// admin users gonna admin
// cluster-admin users cannot update privilegedNamespaces
testID: "cluster-admin-test",
targetNamespace: privilegedNamespace,
username: "lisa",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Update,
shouldBeAllowed: true,
shouldBeAllowed: false,
},
{
// admin users gonna admin
Expand Down Expand Up @@ -762,40 +762,31 @@ func TestAdminUser(t *testing.T) {
shouldBeAllowed: true,
},
{
// Admins should be able to create a privileged namespace
testID: "cluster-admin-in-ns-test",
// cluster-admin group members should not be able to create a privileged namespace
testID: "cluster-admin-group-in-ns-test",
targetNamespace: "in",
username: "lisa",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Create,
shouldBeAllowed: true,
},
{
// Admins should be able to create a privileged namespace
testID: "cluster-admin-in-ns-test",
targetNamespace: privilegedNamespace,
username: "lisa",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Create,
shouldBeAllowed: true,
shouldBeAllowed: false,
},
{
// Admins should be able to update a privileged namespace
// cluster-admin group members should not be able to update a privileged namespace
testID: "cluster-admin-in-ns-test",
targetNamespace: privilegedNamespace,
username: "lisa",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Update,
shouldBeAllowed: true,
shouldBeAllowed: false,
},
{
// Admins should be able to delete a privileged namespace
// cluster-admins group members should not be able to delete a privileged namespace
testID: "cluster-admin-in-ns-test",
targetNamespace: privilegedNamespace,
username: "lisa",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Delete,
shouldBeAllowed: true,
shouldBeAllowed: false,
},
}
runNamespaceTests(t, tests)
Expand Down Expand Up @@ -825,25 +816,13 @@ func TestLabelCreates(t *testing.T) {
shouldBeAllowed: true,
},
{
testID: "cluster-admin-can-create-priv-labelled-ns",
testID: "cluster-admins-group-cannot-create-priv-labelled-ns",
targetNamespace: privilegedNamespace,
username: "no-reply@redhat.com",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Create,
labels: map[string]string{"my-label": "hello"},
shouldBeAllowed: true,
},
{
testID: "cluster-admins-can-create-priv-labelled-ns",
targetNamespace: privilegedNamespace,
username: "no-reply@redhat.com",
userGroups: []string{"cluster-admins", "system:authenticated", "system:authenticated:oauth"},
operation: admissionv1.Create,
labels: map[string]string{
"managed.openshift.io/storage-pv-quota-exempt": "true",
"managed.openshift.io/storage-lb-quota-exempt": "true",
},
shouldBeAllowed: true,
shouldBeAllowed: false,
},
{
testID: "admin-test",
Expand Down