From 89a987bf40a017876209f0f607b815e04fe6a012 Mon Sep 17 00:00:00 2001 From: StudyNick Date: Fri, 17 Mar 2017 14:25:10 +0800 Subject: [PATCH] variable 'controller' collides with imported package name --- cmd/kube-controller-manager/app/controllermanager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 479ffa2d7d..082f1384bd 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -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 } }