github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish controller name change and don't double check feature flag

Browse Source
This commit is contained in:
Mike Danese
2018-11-08 13:54:32 -08:00
parent 91d6d75303
commit 1469bb413e
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/mux"
utilfeature "k8s.io/apiserver/pkg/util/feature"
apiserverflag "k8s.io/apiserver/pkg/util/flag"
cacheddiscovery "k8s.io/client-go/discovery/cached"
"k8s.io/client-go/informers"
@@ -55,7 +54,6 @@ import (
"k8s.io/kubernetes/pkg/controller"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/util/configz"
utilflag "k8s.io/kubernetes/pkg/util/flag"
@@ -337,7 +335,6 @@ func KnownControllers() []string {
var ControllersDisabledByDefault = sets.NewString(
"bootstrapsigner",
"tokencleaner",
"root_ca_crt_publisher",
)
const (
@@ -384,9 +381,7 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc
controllers["pvc-protection"] = startPVCProtectionController
controllers["pv-protection"] = startPVProtectionController
controllers["ttl-after-finished"] = startTTLAfterFinishedController
if utilfeature.DefaultFeatureGate.Enabled(features.TokenRequest) {
controllers["root_ca_crt_publisher"] = startRootCACertPublisher
}
controllers["root-ca-cert-publisher"] = startRootCACertPublisher
return controllers
}