fix multicluster options (#2037)

31436b45 · zryfish · GitHub · 566ed4d4 · 31436b45
Unverified Commit 31436b45 authored 5 years ago by zryfish Committed by GitHub 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 7 additions and 6 deletions
+7 -6
--- 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,
 		}
 	}