github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

allow enabling Leader Migration without config flag.

Browse Source
This commit is contained in:
Indeed 2021-06-08 15:22:11 -07:00
parent bade96ed78
commit 6ba7b3d26b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/controller-manager/pkg/leadermigration/options/options.go
View File

@ -73,7 +73,8 @@ func (o *LeaderMigrationOptions) ApplyTo(cfg *config.GenericControllerManagerCon
return nil return nil
} }
if o.ControllerMigrationConfig == "" { if o.ControllerMigrationConfig == "" {
return fmt.Errorf("--leader-migration-config is required") cfg.LeaderMigration = *migrationconfig.DefaultLeaderMigrationConfiguration()
return nil
} }
leaderMigrationConfig, err := migrationconfig.ReadLeaderMigrationConfiguration(o.ControllerMigrationConfig) leaderMigrationConfig, err := migrationconfig.ReadLeaderMigrationConfiguration(o.ControllerMigrationConfig)
if err != nil { if err != nil {

6
staging/src/k8s.io/controller-manager/pkg/leadermigration/options/options_test.go
View File

@ -27,6 +27,7 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/controller-manager/config" "k8s.io/controller-manager/config"
"k8s.io/controller-manager/pkg/features" "k8s.io/controller-manager/pkg/features"
migrationconfig "k8s.io/controller-manager/pkg/leadermigration/config"
) )
func TestLeaderMigrationOptions(t *testing.T) { func TestLeaderMigrationOptions(t *testing.T) {
@ -53,11 +54,12 @@ func TestLeaderMigrationOptions(t *testing.T) {
expectErr: true, expectErr: true,
}, },
{ {
name: "enabled, but missing configuration file", name: "enabled, with default configuration",
flags: []string{"--enable-leader-migration"}, flags: []string{"--enable-leader-migration"},
enableFeatureGate: true, enableFeatureGate: true,
expectEnabled: true, expectEnabled: true,
expectErr: true, expectErr: false,
expectConfig: migrationconfig.DefaultLeaderMigrationConfiguration(),
}, },
{ {
name: "enabled, with custom configuration file", name: "enabled, with custom configuration file",