scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix leader migration options not applied

Browse Source 
to kube-controller-manager or cloud-controller-manager
This commit is contained in:
Indeed
2021-03-02 15:29:22 -08:00
parent 770a9504ea
commit 68ebe29529
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/options/options_test.go
View File

@@ -35,6 +35,7 @@ import (
"k8s.io/component-base/metrics" "k8s.io/component-base/metrics"
cmconfig "k8s.io/controller-manager/config" cmconfig "k8s.io/controller-manager/config"
cmoptions "k8s.io/controller-manager/options" cmoptions "k8s.io/controller-manager/options"
migration "k8s.io/controller-manager/pkg/leadermigration/options"
kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config" csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
@@ -197,6 +198,7 @@ func TestAddFlags(t *testing.T) {
EnableContentionProfiling: true, EnableContentionProfiling: true,
}, },
}, },
LeaderMigration: &migration.LeaderMigrationOptions{},
}, },
KubeCloudShared: &cpoptions.KubeCloudSharedOptions{ KubeCloudShared: &cpoptions.KubeCloudSharedOptions{
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{ KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{

3
staging/src/k8s.io/cloud-provider/options/options_test.go
View File

@@ -31,6 +31,7 @@ import (
componentbaseconfig "k8s.io/component-base/config" componentbaseconfig "k8s.io/component-base/config"
cmconfig "k8s.io/controller-manager/config" cmconfig "k8s.io/controller-manager/config"
cmoptions "k8s.io/controller-manager/options" cmoptions "k8s.io/controller-manager/options"
migration "k8s.io/controller-manager/pkg/leadermigration/options"
) )
func TestDefaultFlags(t *testing.T) { func TestDefaultFlags(t *testing.T) {
@@ -65,6 +66,7 @@ func TestDefaultFlags(t *testing.T) {
EnableContentionProfiling: false, EnableContentionProfiling: false,
}, },
}, },
LeaderMigration: &migration.LeaderMigrationOptions{},
}, },
KubeCloudShared: &KubeCloudSharedOptions{ KubeCloudShared: &KubeCloudSharedOptions{
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{ KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{
@@ -203,6 +205,7 @@ func TestAddFlags(t *testing.T) {
EnableContentionProfiling: true, EnableContentionProfiling: true,
}, },
}, },
LeaderMigration: &migration.LeaderMigrationOptions{},
}, },
KubeCloudShared: &KubeCloudSharedOptions{ KubeCloudShared: &KubeCloudSharedOptions{
KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{ KubeCloudSharedConfiguration: &cpconfig.KubeCloudSharedConfiguration{

2
staging/src/k8s.io/controller-manager/options/generic.go
View File

@@ -42,7 +42,7 @@ func NewGenericControllerManagerConfigurationOptions(cfg *cmconfig.GenericContro
o := &GenericControllerManagerConfigurationOptions{ o := &GenericControllerManagerConfigurationOptions{
GenericControllerManagerConfiguration: cfg, GenericControllerManagerConfiguration: cfg,
Debugging: RecommendedDebuggingOptions(), Debugging: RecommendedDebuggingOptions(),
LeaderMigration: nil, LeaderMigration: &migration.LeaderMigrationOptions{},
} }
return o return o