admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved Conflict [release-3.3] fix: Resolved some data out of sync after live-reload. #5458 (#5462)

Browse Source 
Resolved Conflict [fix: Resolved some data out of sync after live-reload.]

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
hongzhouzi
2023-01-12 17:44:17 +08:00
committed by GitHub
parent c0419ddab5
commit 690d5be824
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/controller-manager/app/options/options.go
View File

@@ -242,4 +242,5 @@ func (s *KubeSphereControllerManagerOptions) MergeConfig(cfg *controllerconfig.C
s.MultiClusterOptions = cfg.MultiClusterOptions
s.ServiceMeshOptions = cfg.ServiceMeshOptions
s.GatewayOptions = cfg.GatewayOptions
s.MonitoringOptions = cfg.MonitoringOptions
}