Skip to content

K
k3s
Commit d32668b0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43277 from StudyNick/zte-20170315

Automatic merge from submit-queue (batch tested with PRs 44447, 44456, 43277, 41779, 43942) variable 'controller' collides with imported package name variable 'controller' collides with imported package name, 'controller' modify 'ctrl'
parents ef2edcc9 89a987bf
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cmd/kube-controller-manager/app/controllermanager.go
View file @ d32668b0
...@@ -243,14 +243,14 @@ func (c ControllerContext) IsControllerEnabled(name string) bool { ...@@ -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
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment