github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

variable 'controller' collides with imported package name

Browse Source
This commit is contained in:
StudyNick 2017-03-17 14:25:10 +08:00
parent 586fd3374f
commit 89a987bf40
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -243,14 +243,14 @@ func (c ControllerContext) IsControllerEnabled(name string) bool {
func IsControllerEnabled(name string, disabledByDefaultControllers sets.String, controllers ...string) bool { func IsControllerEnabled(name string, disabledByDefaultControllers sets.String, controllers ...string) bool {
hasStar := false hasStar := false
for _, controller := range controllers { for _, ctrl := range controllers {
if controller == name { if ctrl == name {
return true return true
} }
if controller == "-"+name { if ctrl == "-"+name {
return false return false
} }
if controller == "*" { if ctrl == "*" {
hasStar = true hasStar = true
} }
} }