Use shared informers in scheduler and token controller

hack/cherry-pick.sh

@@ -24,6 +24,7 @@ if [[ ! -d "${UPSTREAM_REPO_LOCATION}" ]]; then
   exit 1
 fi
 
+lastrev="${NO_REBASE-}"
 if [[ -z "${NO_REBASE-}" ]]; then
   lastrev="$(go run ${OS_ROOT}/tools/godepversion/godepversion.go ${OS_ROOT}/Godeps/Godeps.json ${repo}/${package})"
 fi

pkg/build/controller/buildpod/buildpod_controller_test.go

@@ -340,6 +340,7 @@ type fakeIndexer struct {
 }
 
 func (*fakeIndexer) Index(indexName string, obj interface{}) ([]interface{}, error) { return nil, nil }
+func (*fakeIndexer) IndexKeys(indexName, indexKey string) ([]string, error)         { return nil, nil }
 func (*fakeIndexer) ListIndexFuncValues(indexName string) []string                  { return nil }
 func (*fakeIndexer) ByIndex(indexName, indexKey string) ([]interface{}, error)      { return nil, nil }
 func (*fakeIndexer) GetIndexers() cache.Indexers                                    { return nil }

pkg/cmd/server/kubernetes/master/kube_controller_init.go

@@ -236,6 +236,7 @@ func (c *MasterConfig) createSchedulerConfig() (*scheduler.Config, error) {
 		c.SchedulerServer.SchedulerName,
 		c.KubeClient,
 		c.Informers.KubernetesInformers().Core().V1().Nodes(),
+		c.Informers.KubernetesInformers().Core().V1().Pods(),
 		c.Informers.KubernetesInformers().Core().V1().PersistentVolumes(),
 		c.Informers.KubernetesInformers().Core().V1().PersistentVolumeClaims(),
 		c.Informers.KubernetesInformers().Core().V1().ReplicationControllers(),

pkg/cmd/server/origin/run_components.go

@@ -105,7 +105,13 @@ func (c *MasterConfig) RunServiceAccountsController() {
 	}
 
 	//REBASE: add new args to NewServiceAccountsController
-	go sacontroller.NewServiceAccountsController(c.Informers.KubernetesInformers().Core().V1().ServiceAccounts(), c.Informers.KubernetesInformers().Core().V1().Namespaces(), c.KubeClientsetExternal(), options).Run(1, utilwait.NeverStop)
+	controller := sacontroller.NewServiceAccountsController(
+		c.Informers.KubernetesInformers().Core().V1().ServiceAccounts(),
+		c.Informers.KubernetesInformers().Core().V1().Namespaces(),
+		c.KubeClientsetExternal(),
+		options,
+	)
+	go controller.Run(1, utilwait.NeverStop)
 }
 
 // RunServiceAccountTokensController starts the service account token controller
@@ -155,7 +161,13 @@ func (c *MasterConfig) RunServiceAccountTokensController(cm *cmapp.CMServer) {
 		ServiceServingCA: servingServingCABundle,
 	}
 
-	go sacontroller.NewTokensController(c.KubeClientsetExternal(), options).Run(int(cm.ConcurrentSATokenSyncs), utilwait.NeverStop)
+	controller := sacontroller.NewTokensController(
+		c.Informers.KubernetesInformers().Core().V1().ServiceAccounts(),
+		c.Informers.KubernetesInformers().Core().V1().Secrets(),
+		c.KubeClientsetExternal(),
+		options,
+	)
+	go controller.Run(int(cm.ConcurrentSATokenSyncs), utilwait.NeverStop)
 }
 
 // RunServiceAccountPullSecretsControllers starts the service account pull secret controllers

pkg/cmd/server/start/start_master.go

@@ -609,6 +609,11 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro
 	// Start these first, because they provide credentials for other controllers' clients
 	oc.RunServiceAccountsController()
 	oc.RunServiceAccountTokensController(controllerManagerOptions)
+	// The service account controllers require informers in order to create service account tokens
+	// for other controllers, which means we need to start their informers (which use the privileged
+	// loopback client) before the other controllers will run.
+	oc.Informers.KubernetesInformers().Start(utilwait.NeverStop)
+
 	// used by admission controllers
 	oc.RunServiceAccountPullSecretsControllers()
 	oc.RunSecurityAllocationController()