Skip to content

Commit

Permalink
Merge pull request #14 from sallyom/update-leaderelection
Browse files Browse the repository at this point in the history
LeaderElectionDefaulting to cluster-policy-controller
  • Loading branch information
openshift-merge-robot committed Oct 18, 2019
2 parents 69301f3 + d68f418 commit 9b6ccc8
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -12,7 +12,7 @@ import (
func setRecommendedOpenShiftControllerConfigDefaults(config *openshiftcontrolplanev1.OpenShiftControllerManagerConfig) {
configdefaults.SetRecommendedHTTPServingInfoDefaults(config.ServingInfo)
configdefaults.SetRecommendedKubeClientConfigDefaults(&config.KubeClientConfig)
config.LeaderElection = leaderelectionconverter.LeaderElectionDefaulting(config.LeaderElection, "kube-system", "openshift-master-controllers")
config.LeaderElection = leaderelectionconverter.LeaderElectionDefaulting(config.LeaderElection, "openshift-kube-controller-manager", "cluster-policy-controller")

configdefaults.DefaultStringSlice(&config.Controllers, []string{"*"})

Expand Down

0 comments on commit 9b6ccc8

Please sign in to comment.