Merge pull request #41547 from xilabao/remove-validNonResourceVerbs-in-create-role

Automatic merge from submit-queue (batch tested with PRs 41604, 41273, 41547)

remove validNonResourceVerbs in create role

non-resource-url is only reasonable for clusterroles

pkg/kubectl/cmd/create_role.go

@@ -43,9 +43,6 @@ var (
 
 	// Valid resource verb list for validation.
 	validResourceVerbs = []string{"*", "get", "delete", "list", "create", "update", "patch", "watch", "proxy", "redirect", "deletecollection"}
-
-	// Valid non-resource verb list for validation.
-	validNonResourceVerbs = []string{"get", "post", "put", "delete"}
 )
 
 type CreateRoleOptions struct {
@@ -137,7 +134,7 @@ func (c *CreateRoleOptions) Validate(f cmdutil.Factory) error {
 	}
 
 	for _, v := range c.Verbs {
-		if !arrayContains(validResourceVerbs, v) && !arrayContains(validNonResourceVerbs, v) {
+		if !arrayContains(validResourceVerbs, v) {
 			return fmt.Errorf("invalid verb: '%s'", v)
 		}
 	}

pkg/kubectl/cmd/create_role_test.go

@@ -157,6 +157,18 @@ func TestValidate(t *testing.T) {
 			},
 			expectErr: true,
 		},
+		"test-nonresource-verb": {
+			roleOptions: &CreateRoleOptions{
+				Name:  "my-role",
+				Verbs: []string{"post"},
+				Resources: []schema.GroupVersionResource{
+					{
+						Resource: "pods",
+					},
+				},
+			},
+			expectErr: true,
+		},
 		"test-invalid-resource": {
 			roleOptions: &CreateRoleOptions{
 				Name:  "my-role",