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

Merge pull request #196 from richardxz/master

Browse Source 
ignore the role/clusterrole which don't have "creator" annotation
This commit is contained in:
richardxz
2018-10-24 15:29:38 +08:00
committed by GitHub
parent 59d26c2809 33dd9fb2dd
commit 920d09042d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/controllers/clusterroles.go
View File

@@ -36,7 +36,7 @@ func (ctl *ClusterRoleCtl) generateObject(item v1.ClusterRole) *ClusterRole {
} }
name := item.Name name := item.Name
if strings.HasPrefix(name, systemPrefix) { if strings.HasPrefix(name, systemPrefix) || item.Annotations == nil || len(item.Annotations[creator]) == 0 {
return nil return nil
} }

4
pkg/models/controllers/roles.go
View File

@@ -30,12 +30,12 @@ import (
func (ctl *RoleCtl) generateObject(item v1.Role) *Role { func (ctl *RoleCtl) generateObject(item v1.Role) *Role {
var displayName string var displayName string
if item.Annotations != nil && len(item.Annotations[DisplayName]) > 0 { if item.Annotations != nil && len(item.Annotations[DisplayName]) == 0 {
displayName = item.Annotations[DisplayName] displayName = item.Annotations[DisplayName]
} }
name := item.Name name := item.Name
if strings.HasPrefix(name, systemPrefix) { if strings.HasPrefix(name, systemPrefix) || item.Annotations == nil || len(item.Annotations[creator]) == 0 {
return nil return nil
} }
namespace := item.Namespace namespace := item.Namespace

1
pkg/models/controllers/types.go
View File

@@ -49,6 +49,7 @@ const (
Warning = "warning" Warning = "warning"
Error = "error" Error = "error"
DisplayName = "displayName" DisplayName = "displayName"
creator = "creator"
Pods = "pods" Pods = "pods"
Deployments = "deployments" Deployments = "deployments"