github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90649 from cici37/leaderelectionconfig

Browse Source 
Moving leaderelectionconfig to k8s.io/component-base
This commit is contained in:
Kubernetes Prow Robot
2020-05-20 19:40:47 -07:00
committed by GitHub
parent 2f883e5802 f52636330a
commit 12088aa76d
9 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/controller-manager/app/options/BUILD
View File

@@ -12,12 +12,12 @@ go_library(
importpath = "k8s.io/kubernetes/cmd/controller-manager/app/options",
visibility = ["//visibility:public"],
deps = [
"//pkg/client/leaderelectionconfig:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//pkg/controller/service/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//staging/src/k8s.io/component-base/config/options:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
],
)

4
cmd/controller-manager/app/options/generic.go
View File

@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
"k8s.io/component-base/config/options"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
@@ -62,7 +62,7 @@ func (o *GenericControllerManagerConfigurationOptions) AddFlags(fss *cliflag.Nam
"named 'foo', '-foo' disables the controller named 'foo'.\nAll controllers: %s\nDisabled-by-default controllers: %s",
strings.Join(allControllers, ", "), strings.Join(disabledByDefaultControllers, ", ")))
leaderelectionconfig.BindFlags(&o.LeaderElection, genericfs)
options.BindLeaderElectionFlags(&o.LeaderElection, genericfs)
}
// ApplyTo fills up generic config with options.