github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

refactor run to use a callback instead.

Browse Source
This commit is contained in:
Indeed 2021-03-09 13:52:59 -08:00
parent ba47f60e4b
commit 2a73fdf9ea
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -212,12 +212,13 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
saTokenControllerInitFunc := serviceAccountTokenControllerStarter{rootClientBuilder: rootClientBuilder}.startServiceAccountTokenController saTokenControllerInitFunc := serviceAccountTokenControllerStarter{rootClientBuilder: rootClientBuilder}.startServiceAccountTokenController
run := func(ctx context.Context, startSATokenController InitFunc, filterFunc leadermigration.FilterFunc, requiredResult leadermigration.FilterResult) { run := func(ctx context.Context, startSATokenController InitFunc, initializersFunc ControllerInitializersFunc) {
controllerContext, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, ctx.Done()) controllerContext, err := CreateControllerContext(c, rootClientBuilder, clientBuilder, ctx.Done())
if err != nil { if err != nil {
klog.Fatalf("error building controller context: %v", err) klog.Fatalf("error building controller context: %v", err)
} }
controllerInitializers := filterInitializers(NewControllerInitializers(controllerContext.LoopMode), filterFunc, requiredResult) controllerInitializers := initializersFunc(controllerContext.LoopMode)
if err := StartControllers(controllerContext, startSATokenController, controllerInitializers, unsecuredMux); err != nil { if err := StartControllers(controllerContext, startSATokenController, controllerInitializers, unsecuredMux); err != nil {
klog.Fatalf("error starting controllers: %v", err) klog.Fatalf("error starting controllers: %v", err)
} }
@ -231,7 +232,7 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
// No leader election, run directly // No leader election, run directly
if !c.ComponentConfig.Generic.LeaderElection.LeaderElect { if !c.ComponentConfig.Generic.LeaderElection.LeaderElect {
run(context.TODO(), saTokenControllerInitFunc, nil, leadermigration.ControllerNonMigrated) run(context.TODO(), saTokenControllerInitFunc, NewControllerInitializers)
panic("unreachable") panic("unreachable")
} }
@ -270,14 +271,14 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
c.ComponentConfig.Generic.LeaderElection.ResourceName, c.ComponentConfig.Generic.LeaderElection.ResourceName,
leaderelection.LeaderCallbacks{ leaderelection.LeaderCallbacks{
OnStartedLeading: func(ctx context.Context) { OnStartedLeading: func(ctx context.Context) {
var filterFunc leadermigration.FilterFunc = nil initializersFunc := NewControllerInitializers
if leaderMigrator != nil { if leaderMigrator != nil {
// If leader migration is enabled, we should start only non-migrated controllers // If leader migration is enabled, we should start only non-migrated controllers
// for the main lock. // for the main lock.
filterFunc = leaderMigrator.FilterFunc initializersFunc = createInitializersFunc(leaderMigrator.FilterFunc, leadermigration.ControllerNonMigrated)
klog.Info("leader migration: starting main controllers.") klog.Info("leader migration: starting main controllers.")
} }
run(ctx, startSATokenController, filterFunc, leadermigration.ControllerNonMigrated) run(ctx, startSATokenController, initializersFunc)
}, },
OnStoppedLeading: func() { OnStoppedLeading: func() {
klog.Fatalf("leaderelection lost") klog.Fatalf("leaderelection lost")
@ -299,8 +300,8 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
leaderelection.LeaderCallbacks{ leaderelection.LeaderCallbacks{
OnStartedLeading: func(ctx context.Context) { OnStartedLeading: func(ctx context.Context) {
klog.Info("leader migration: starting migrated controllers.") klog.Info("leader migration: starting migrated controllers.")
// DO NOT start saTokenController under migration lock (passing nil) // DO NOT start saTokenController under migration lock
run(ctx, nil, leaderMigrator.FilterFunc, leadermigration.ControllerMigrated) run(ctx, nil, createInitializersFunc(leaderMigrator.FilterFunc, leadermigration.ControllerMigrated))
}, },
OnStoppedLeading: func() { OnStoppedLeading: func() {
klog.Fatalf("migration leaderelection lost") klog.Fatalf("migration leaderelection lost")
@ -368,6 +369,12 @@ func (c ControllerContext) IsControllerEnabled(name string) bool {
// The bool indicates whether the controller was enabled. // The bool indicates whether the controller was enabled.
type InitFunc func(ctx ControllerContext) (debuggingHandler http.Handler, enabled bool, err error) type InitFunc func(ctx ControllerContext) (debuggingHandler http.Handler, enabled bool, err error)
// ControllerInitializersFunc is used to create a collection of initializers
// given the loopMode.
type ControllerInitializersFunc func(loopMode ControllerLoopMode) (initializers map[string]InitFunc)
var _ ControllerInitializersFunc = NewControllerInitializers
// KnownControllers returns all known controllers's name // KnownControllers returns all known controllers's name
func KnownControllers() []string { func KnownControllers() []string {
ret := sets.StringKeySet(NewControllerInitializers(IncludeCloudLoops)) ret := sets.StringKeySet(NewControllerInitializers(IncludeCloudLoops))
@ -688,18 +695,16 @@ func leaderElectAndRun(c *config.CompletedConfig, lockIdentity string, electionC
panic("unreachable") panic("unreachable")
} }
// filterInitializers returns initializers that has filterFunc(name) == expected. // createInitializersFunc creates a initializersFunc that returns all initializer
// filterFunc can be nil, in which case the original initializers will be returned directly. // with expected as the result after filtering through filterFunc.
// InitFunc is local to kube-controller-manager, and thus filterInitializers has to be local too. func createInitializersFunc(filterFunc leadermigration.FilterFunc, expected leadermigration.FilterResult) ControllerInitializersFunc {
func filterInitializers(allInitializers map[string]InitFunc, filterFunc leadermigration.FilterFunc, expected leadermigration.FilterResult) map[string]InitFunc { return func(loopMode ControllerLoopMode) map[string]InitFunc {
if filterFunc == nil {
return allInitializers
}
initializers := make(map[string]InitFunc) initializers := make(map[string]InitFunc)
for name, initFunc := range allInitializers { for name, initializer := range NewControllerInitializers(loopMode) {
if filterFunc(name) == expected { if filterFunc(name) == expected {
initializers[name] = initFunc initializers[name] = initializer
} }
} }
return initializers return initializers
}
} }