admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
hongming
2018-06-01 16:31:25 +08:00
parent b65ba97e77
commit 5e1cb6b79d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/v1alpha/iam/iam_handler.go
View File

@@ -110,7 +110,7 @@ func clusterRoleUsersHandler(req *restful.Request, resp *restful.Response) {
for _, roleBinding := range roleBindings { for _, roleBinding := range roleBindings {
for _, subject := range roleBinding.Subjects { for _, subject := range roleBinding.Subjects {
if subject.Kind == v1.UserKind { if subject.Kind == v1.UserKind && !strings.HasPrefix(subject.Name, "system") {
users = append(users, subject.Name) users = append(users, subject.Name)
} }
} }

2
pkg/apis/v1alpha/iam/policy.go
View File

@@ -41,7 +41,7 @@ type userRuleList struct {
Rules map[string][]rule `json:"rules"` Rules map[string][]rule `json:"rules"`
} }
// TODO design all frontend-facing rules // TODO stored in etcd, allow updates
var ( var (
clusterRoleRuleGroup = []rule{projectsManagement, userManagement, roleManagement, registryManagement, clusterRoleRuleGroup = []rule{projectsManagement, userManagement, roleManagement, registryManagement,
volumeManagement, storageclassManagement, nodeManagement, appCatalogManagement, appManagement} volumeManagement, storageclassManagement, nodeManagement, appCatalogManagement, appManagement}

4
pkg/models/roles.go
View File

@@ -33,7 +33,7 @@ func GetClusterRoleBindings(name string) ([]v1.ClusterRoleBinding, error) {
} }
} }
return roleBindingList.Items, nil return items, nil
} }
func GetRoleBindings(namespace string, name string) ([]v1.RoleBinding, error) { func GetRoleBindings(namespace string, name string) ([]v1.RoleBinding, error) {
@@ -53,7 +53,7 @@ func GetRoleBindings(namespace string, name string) ([]v1.RoleBinding, error) {
} }
} }
return roleBindingList.Items, nil return items, nil
} }
func GetClusterRole(name string) (*v1.ClusterRole, error) { func GetClusterRole(name string) (*v1.ClusterRole, error) {