Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kubesphere
Commits
31436b45
Unverified
Commit
31436b45
authored
5 years ago
by
zryfish
Committed by
GitHub
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix multicluster options (#2037)
parent
566ed4d4
master
LinuxSuRen-patch-1
dependabot/go_modules/staging/src/kubesphere.io/utils/helm.sh/helm/v3-3.9.4
dev
feature-pluggable
kse-3.3-fix
release-3.0
release-3.1
release-3.2
release-3.3
v3.3.1
v3.3.1-rc.5
v3.3.1-rc.4
v3.3.1-rc.3
v3.3.1-rc.2
v3.3.1-rc.1
v3.3.1-rc.0
v3.3.1-alpha.0
v3.3.0
v3.3.0-rc.3
v3.3.0-rc.2
v3.3.0-rc.1
v3.3.0-rc.0
v3.3.0-alpha.1
v3.3.0-alpha.0
v3.2.1
v3.2.1-rc.3
v3.2.1-rc.2
v3.2.1-rc.1
v3.2.0
v3.2.0-rc.1
v3.2.0-alpha.1
v3.2.0-alpha.0
v3.1.1
v3.1.1-rc.1
v3.1.1-rc.0
v3.1.0
v3.1.0-alpha.0
v3.0.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmd/controller-manager/app/server.go
+7
-6
cmd/controller-manager/app/server.go
with
7 additions
and
6 deletions
+7
-6
cmd/controller-manager/app/server.go
+
7
-
6
View file @
31436b45
...
...
@@ -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
,
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help