From 31436b451dc6d16753614ed5413d974a8629b635 Mon Sep 17 00:00:00 2001 From: zryfish Date: Wed, 29 Apr 2020 14:36:40 +0800 Subject: [PATCH] fix multicluster options (#2037) --- cmd/controller-manager/app/server.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go index 899ff5c1c..8fb527258 100644 --- a/cmd/controller-manager/app/server.go +++ b/cmd/controller-manager/app/server.go @@ -57,12 +57,13 @@ func NewControllerManagerCommand() *cobra.Command { if err == nil { // make sure LeaderElection is not nil s = &options.KubeSphereControllerManagerOptions{ - KubernetesOptions: conf.KubernetesOptions, - DevopsOptions: conf.DevopsOptions, - S3Options: conf.S3Options, - OpenPitrixOptions: conf.OpenPitrixOptions, - LeaderElection: s.LeaderElection, - LeaderElect: s.LeaderElect, + KubernetesOptions: conf.KubernetesOptions, + DevopsOptions: conf.DevopsOptions, + S3Options: conf.S3Options, + OpenPitrixOptions: conf.OpenPitrixOptions, + MultiClusterOptions: conf.MultiClusterOptions, + LeaderElection: s.LeaderElection, + LeaderElect: s.LeaderElect, } }