Add leader election namespace configuration (openshift#920)

charts/catalog/templates/controller-manager-deployment.yaml

@@ -31,9 +31,17 @@ spec:
  limits:
  cpu: 100m
  memory: 30Mi
+ env:
+ - name: K8S_NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
  args:
  - --port
  - "8080"
+ {{ if .Values.controllerManager.leaderElectionNamespace.activated -}}
+ - "--leader-election-namespace=$(K8S_NAMESPACE)"
+ {{- end }}
  {{ if .Values.controllerManager.profiling.disabled -}}
  - "--profiling=false"
  {{- end}}

charts/catalog/values.yaml

@@ -75,4 +75,7 @@ controllerManager:
  disabled: false
  # Enables lock contention profiling, if profiling is enabled.
  contentionProfiling: false
+ leaderElectionNamespace:
+ # Whether the controller has option to set leader election namespace.
+ activated: false
 useAggregator: false

cmd/controller-manager/app/controller_manager.go

@@ -208,10 +208,12 @@ func Run(controllerManagerOptions *options.ControllerManagerServer) error {
  return err
  }
 
+ glog.V(5).Infof("Using namespace %v for leader election lock", controllerManagerOptions.LeaderElectionNamespace)
+
  // Lock required for leader election
  rl := resourcelock.EndpointsLock{
  EndpointsMeta: metav1.ObjectMeta{
- Namespace: "kube-system",
+ Namespace: controllerManagerOptions.LeaderElectionNamespace,
  Name: "service-catalog-controller-manager",
  },
  Client: leaderElectionClient,

cmd/controller-manager/app/options/options.go

@@ -36,15 +36,18 @@ type ControllerManagerServer struct {
  componentconfig.ControllerManagerConfiguration
 }
 
-const defaultResyncInterval = 5 * time.Minute
-const defaultBrokerRelistInterval = 24 * time.Hour
-const defaultContentType = "application/json"
-const defaultBindAddress = "0.0.0.0"
-const defaultPort = 10000
-const defaultK8sKubeconfigPath = "./kubeconfig"
-const defaultServiceCatalogKubeconfigPath = "./service-catalog-kubeconfig"
-const defaultOSBAPIContextProfile = true
-const defaultConcurrentSyncs = 5
+const (
+ defaultResyncInterval = 5 * time.Minute
+ defaultBrokerRelistInterval = 24 * time.Hour
+ defaultContentType = "application/json"
+ defaultBindAddress = "0.0.0.0"
+ defaultPort = 10000
+ defaultK8sKubeconfigPath = "./kubeconfig"
+ defaultServiceCatalogKubeconfigPath = "./service-catalog-kubeconfig"
+ defaultOSBAPIContextProfile = true
+ defaultConcurrentSyncs = 5
+ defaultLeaderElectionNamespace = "kube-system"
+)
 
 // NewControllerManagerServer creates a new ControllerManagerServer with a
 // default config.
@@ -61,6 +64,7 @@ func NewControllerManagerServer() *ControllerManagerServer {
  OSBAPIContextProfile: defaultOSBAPIContextProfile,
  ConcurrentSyncs: defaultConcurrentSyncs,
  LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(),
+ LeaderElectionNamespace: defaultLeaderElectionNamespace,
  EnableProfiling: true,
  EnableContentionProfiling: false,
  },
@@ -84,4 +88,5 @@ func (s *ControllerManagerServer) AddFlags(fs *pflag.FlagSet) {
  fs.BoolVar(&s.EnableProfiling, "profiling", s.EnableProfiling, "Enable profiling via web interface host:port/debug/pprof/")
  fs.BoolVar(&s.EnableContentionProfiling, "contention-profiling", s.EnableContentionProfiling, "Enable lock contention profiling, if profiling is enabled")
  leaderelection.BindFlags(&s.LeaderElection, fs)
+ fs.StringVar(&s.LeaderElectionNamespace, "leader-election-namespace", s.LeaderElectionNamespace, "Namespace to use for leader election lock")
 }

pkg/apis/componentconfig/types.go

@@ -75,6 +75,10 @@ type ControllerManagerConfiguration struct {
  // leaderElection defines the configuration of leader election client.
  LeaderElection componentconfig.LeaderElectionConfiguration
 
+ // LeaderElectionNamespace is the namespace to use for the leader election
+ // lock.
+ LeaderElectionNamespace string
+
  // enableProfiling enables profiling via web interface host:port/debug/pprof/
  EnableProfiling bool