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

Merge pull request #117 from wansir/master

Browse Source 
Fixed role definition.
This commit is contained in:
不羁
2018-06-26 13:18:37 +08:00
committed by GitHub
parent 24594fd28d a1d8edc8d9
commit 450fe1affa
3 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/controllers/namespaces.go
View File

@@ -48,8 +48,8 @@ const (
)
var adminRules = []rbac.PolicyRule{{Verbs: []string{"*"}, APIGroups: []string{"*"}, Resources: []string{"*"}}}
var editorRules = []rbac.PolicyRule{{Verbs: []string{"*"}, APIGroups: []string{"", "apps", "extensions"}, Resources: []string{"*"}}}
var viewerRules = []rbac.PolicyRule{{Verbs: []string{"list", "get"}, APIGroups: []string{"", "apps", "extensions"}, Resources: []string{"*"}}}
var editorRules = []rbac.PolicyRule{{Verbs: []string{"*"}, APIGroups: []string{"", "apps", "extensions", "batch"}, Resources: []string{"*"}}}
var viewerRules = []rbac.PolicyRule{{Verbs: []string{"list", "get", "watch"}, APIGroups: []string{"", "apps", "extensions", "batch"}, Resources: []string{"*"}}}
type runTime struct {
RuntimeId string `json:"runtime_id"`
@@ -200,13 +200,13 @@ func (ctl *NamespaceCtl) createRoleAndRuntime(item v1.Namespace) {
return
}
err = ctl.createDefaultRoleBinding(ns, user)
resp, err := ctl.createOpRuntime(ns)
if err != nil {
glog.Error(err)
return
}
resp, err := ctl.createOpRuntime(ns)
err = ctl.createDefaultRoleBinding(ns, user)
if err != nil {
glog.Error(err)
return