github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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'
pull/6/head
Kubernetes Submit Queue 2017-04-13 15:01:58 -07:00 committed by GitHub
parent ef2edcc94e 89a987bf40
commit d32668b0be
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 {
hasStar := false
for _, controller := range controllers {
if controller == name {
for _, ctrl := range controllers {
if ctrl == name {
return true
}
if controller == "-"+name {
if ctrl == "-"+name {
return false
}
if controller == "*" {
if ctrl == "*" {
hasStar = true
}
}