make all controllers obey the disable flags

cmd/kube-controller-manager/app/controllermanager.go

@@ -262,7 +262,19 @@ func IsControllerEnabled(name string, disabledByDefaultControllers sets.String,
 type InitFunc func(ctx ControllerContext) (bool, error)
 
 func KnownControllers() []string {
-	return sets.StringKeySet(newControllerInitializers()).List()
+	ret := sets.StringKeySet(newControllerInitializers())
+
+	ret.Insert(
+		saTokenControllerName,
+		nodeControllerName,
+		serviceControllerName,
+		routeControllerName,
+		pvBinderControllerName,
+		attachDetatchControllerName,
+	)
+
+	// add "special" controllers that aren't initialized normally
+	return ret.List()
 }
 
 var ControllersDisabledByDefault = sets.NewString(
@@ -335,12 +347,21 @@ func getAvailableResources(clientBuilder controller.ControllerClientBuilder) (ma
 	return allResources, nil
 }
 
+const (
+	saTokenControllerName       = "serviceaccount-token"
+	nodeControllerName          = "node"
+	serviceControllerName       = "service"
+	routeControllerName         = "route"
+	pvBinderControllerName      = "persistentvolume-binder"
+	attachDetatchControllerName = "attachdetach"
+)
+
 func StartControllers(controllers map[string]InitFunc, s *options.CMServer, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}) error {
 	versionedClient := rootClientBuilder.ClientOrDie("shared-informers")
 	sharedInformers := informers.NewSharedInformerFactory(versionedClient, ResyncPeriod(s)())
 
 	// always start the SA token controller first using a full-power client, since it needs to mint tokens for the rest
-	if len(s.ServiceAccountKeyFile) > 0 {
+	if len(s.ServiceAccountKeyFile) > 0 && IsControllerEnabled(saTokenControllerName, ControllersDisabledByDefault, s.Controllers...) {
 		privateKey, err := serviceaccount.ReadPrivateKey(s.ServiceAccountKeyFile)
 		if err != nil {
 			return fmt.Errorf("error reading key for service account token controller: %v", err)
@@ -367,6 +388,9 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 			).Run(int(s.ConcurrentSATokenSyncs), stop)
 			time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
 		}
+
+	} else {
+		glog.Warningf("%q is disabled", saTokenControllerName)
 	}
 
 	availableResources, err := getAvailableResources(clientBuilder)
@@ -403,11 +427,13 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 		glog.Infof("Started %q", controllerName)
 	}
 
+	// all the remaning plugins want this cloud variable
 	cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
 	if err != nil {
 		return fmt.Errorf("cloud provider could not be initialized: %v", err)
 	}
 
+	if ctx.IsControllerEnabled(nodeControllerName) {
 		_, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR)
 		if err != nil {
 			glog.Warningf("Unsuccessful parsing of cluster CIDR %v: %v", s.ClusterCIDR, err)
@@ -443,6 +469,11 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 		nodeController.Run()
 		time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
 
+	} else {
+		glog.Warningf("%q is disabled", nodeControllerName)
+	}
+
+	if ctx.IsControllerEnabled(serviceControllerName) {
 		serviceController, err := servicecontroller.New(
 			cloud,
 			clientBuilder.ClientOrDie("service-controller"),
@@ -456,7 +487,15 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 			go serviceController.Run(stop, int(s.ConcurrentServiceSyncs))
 		}
 		time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
+	} else {
+		glog.Warningf("%q is disabled", serviceControllerName)
+	}
 
+	if ctx.IsControllerEnabled(routeControllerName) {
+		_, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR)
+		if err != nil {
+			glog.Warningf("Unsuccessful parsing of cluster CIDR %v: %v", s.ClusterCIDR, err)
+		}
 		if s.AllocateNodeCIDRs && s.ConfigureCloudRoutes {
 			if cloud == nil {
 				glog.Warning("configure-cloud-routes is set, but no cloud provider specified. Will not configure cloud provider routes.")
@@ -470,7 +509,11 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 		} else {
 			glog.Infof("Will not configure cloud provider routes for allocate-node-cidrs: %v, configure-cloud-routes: %v.", s.AllocateNodeCIDRs, s.ConfigureCloudRoutes)
 		}
+	} else {
+		glog.Warningf("%q is disabled", routeControllerName)
+	}
 
+	if ctx.IsControllerEnabled(pvBinderControllerName) {
 		alphaProvisioner, err := NewAlphaVolumeProvisioner(cloud, s.VolumeConfiguration)
 		if err != nil {
 			return fmt.Errorf("an backward-compatible provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err)
@@ -490,11 +533,14 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 		volumeController := persistentvolumecontroller.NewController(params)
 		go volumeController.Run(stop)
 		time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
+	} else {
+		glog.Warningf("%q is disabled", pvBinderControllerName)
+	}
 
+	if ctx.IsControllerEnabled(attachDetatchControllerName) {
 		if s.ReconcilerSyncLoopPeriod.Duration < time.Second {
 			return fmt.Errorf("Duration time must be greater than one second as set via command line option reconcile-sync-loop-period.")
 		}
-
 		attachDetachController, attachDetachControllerErr :=
 			attachdetach.NewAttachDetachController(
 				clientBuilder.ClientOrDie("attachdetach-controller"),
@@ -512,6 +558,9 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
 		}
 		go attachDetachController.Run(stop)
 		time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
+	} else {
+		glog.Warningf("%q is disabled", attachDetatchControllerName)
+	}
 
 	sharedInformers.Start(stop)