mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
fix leader migration options not applied
to kube-controller-manager or cloud-controller-manager
This commit is contained in:
parent
770a9504ea
commit
68ebe29529
@ -35,6 +35,7 @@ import (
|
||||
"k8s.io/component-base/metrics"
|
||||
cmconfig "k8s.io/controller-manager/config"
|
||||
cmoptions "k8s.io/controller-manager/options"
|
||||
migration "k8s.io/controller-manager/pkg/leadermigration/options"
|
||||
kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
|
||||
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
|
||||
csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
|
||||
@ -197,6 +198,7 @@ func TestAddFlags(t *testing.T) {
|
||||
EnableContentionProfiling: true,
|
||||
},
|
||||
},
|
||||
LeaderMigration: &migration.LeaderMigrationOptions{},
|
||||
},
|
||||
KubeCloudShared: &cpoptions.KubeCloudSharedOptions{
|
||||
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{
|
||||
|
@ -31,6 +31,7 @@ import (
|
||||
componentbaseconfig "k8s.io/component-base/config"
|
||||
cmconfig "k8s.io/controller-manager/config"
|
||||
cmoptions "k8s.io/controller-manager/options"
|
||||
migration "k8s.io/controller-manager/pkg/leadermigration/options"
|
||||
)
|
||||
|
||||
func TestDefaultFlags(t *testing.T) {
|
||||
@ -65,6 +66,7 @@ func TestDefaultFlags(t *testing.T) {
|
||||
EnableContentionProfiling: false,
|
||||
},
|
||||
},
|
||||
LeaderMigration: &migration.LeaderMigrationOptions{},
|
||||
},
|
||||
KubeCloudShared: &KubeCloudSharedOptions{
|
||||
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{
|
||||
@ -203,6 +205,7 @@ func TestAddFlags(t *testing.T) {
|
||||
EnableContentionProfiling: true,
|
||||
},
|
||||
},
|
||||
LeaderMigration: &migration.LeaderMigrationOptions{},
|
||||
},
|
||||
KubeCloudShared: &KubeCloudSharedOptions{
|
||||
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{
|
||||
|
@ -42,7 +42,7 @@ func NewGenericControllerManagerConfigurationOptions(cfg *cmconfig.GenericContro
|
||||
o := &GenericControllerManagerConfigurationOptions{
|
||||
GenericControllerManagerConfiguration: cfg,
|
||||
Debugging: RecommendedDebuggingOptions(),
|
||||
LeaderMigration: nil,
|
||||
LeaderMigration: &migration.LeaderMigrationOptions{},
|
||||
}
|
||||
|
||||
return o
|
||||
|
Loading…
Reference in New Issue
Block a user