Skip to content

[v0.7|main] Make admission rejection message more useful for namespace creation #572

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 2 commits into from
Feb 5, 2025
Merged

[v0.7|main] Make admission rejection message more useful for namespace creation #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1d519b
Make admission rejection message more useful for namespace creation
crobby Dec 17, 2024
64747ea
Updating test to check for updated admission rejection message
crobby Feb 3, 2025
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
5 changes: 4 additions & 1 deletion pkg/resources/core/v1/namespace/projectannotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,13 @@ func (p *projectNamespaceAdmitter) Admit(request *admission.Request) (*admission
return response, nil
}

constructedReason := fmt.Sprintf("User %q does not have permission %q on project %q",
request.UserInfo.Username, manageNSVerb, projectName)

response.Allowed = false
response.Result = &metav1.Status{
Status: "Failure",
Message: sarResponse.Status.Reason,
Message: constructedReason,
Reason: metav1.StatusReasonUnauthorized,
Code: http.StatusForbidden,
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/resources/core/v1/namespace/projectannotations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func TestValidateProjectNamespaceAnnotations(t *testing.T) {
includeProjectAnnotation bool
targetProject string
userCanAccessProject bool
rejectMessage string
sarError bool
wantError bool
wantAllowed bool
Expand Down Expand Up @@ -72,6 +73,7 @@ func TestValidateProjectNamespaceAnnotations(t *testing.T) {
includeProjectAnnotation: true,
targetProject: "p-123xyz",
userCanAccessProject: false,
rejectMessage: "User \"test-user\" does not have permission \"manage-namespaces\" on project \"p-123xyz\"",
sarError: false,
wantError: false,
wantAllowed: false,
Expand Down Expand Up @@ -220,6 +222,9 @@ func TestValidateProjectNamespaceAnnotations(t *testing.T) {
} else {
assert.NoError(t, err)
assert.Equal(t, test.wantAllowed, response.Allowed)
if test.rejectMessage != "" {
assert.Equal(t, test.rejectMessage, response.Result.Message)
}
}
})
}
Expand Down