github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #61461 from WanLinghao/cluster_role_error_fix 

Automatic merge from submit-queue (batch tested with PRs 61396, 61321, 61443, 60911, 61461). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

	fix a error in return value

**What this PR does / why we need it**:
This patch fix a small bug in function GetClusterRole() which returns with wrong error info.
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-03-22 03:37:22 -07:00 committed by GitHub
parent f18fdc2ea0 f35402e515
commit ccc1fc4197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/rbac/validation/rule.go
View File

@ -315,7 +315,7 @@ func (r *StaticRoles) GetClusterRole(name string) (*rbac.ClusterRole, error) {
return clusterRole, nil
}
}
return nil, errors.New("role not found")
return nil, errors.New("clusterrole not found")
}
func (r *StaticRoles) ListRoleBindings(namespace string) ([]*rbac.RoleBinding, error) {