github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130788 from jpbetz/fix-subresources

Browse Source 
Fix subresource parsing for declarative validation
This commit is contained in:
Kubernetes Prow Robot
2025-03-13 14:56:08 -07:00
committed by GitHub
parent 5ff9047a50 d9a2dee622
commit dabb4e2445
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/registry/rest/validate.go
View File

@@ -102,10 +102,12 @@ func parseSubresourcePath(subresourcePath string) ([]string, error) {
if len(subresourcePath) == 0 {
return nil, nil
}
if subresourcePath[0] != '/' {
return nil, fmt.Errorf("invalid subresource path: %s", subresourcePath)
parts := strings.Split(subresourcePath, "/")
for _, part := range parts {
if len(part) == 0 {
return nil, fmt.Errorf("invalid subresource path: %s", subresourcePath)
}
}
parts := strings.Split(subresourcePath[1:], "/")
return parts, nil
}

13
staging/src/k8s.io/apiserver/pkg/registry/rest/validate_test.go
View File

@@ -85,15 +85,22 @@ func TestValidateDeclaratively(t *testing.T) {
expected: field.ErrorList{invalidRestartPolicyErr, mutatedRestartPolicyErr},
},
{
name: "update subresource",
subresource: "/status",
name: "update subresource with declarative validation",
subresource: "status",
object: valid,
oldObject: valid,
expected: field.ErrorList{invalidStatusErr},
},
{
name: "update subresource without declarative validation",
subresource: "scale",
object: valid,
oldObject: valid,
expected: field.ErrorList{}, // Expect no errors if there is no registered validation
},
{
name: "invalid subresource",
subresource: "invalid/status",
subresource: "/invalid/status",
object: valid,
oldObject: valid,
expected: field.ErrorList{invalidSubresourceErr},