karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4459 from yanfeng1992/fix-controllerruntime-option 

cleanup controllerruntime deprecated option SyncPeriod Namespace
This commit is contained in:
karmada-bot 2023-12-21 16:57:17 +08:00 committed by GitHub
parent f8cdc40591 22e4f4bb8c
commit bff8aa90fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/agent/app/agent.go
View File

@ -196,8 +196,7 @@ func run(ctx context.Context, opts *options.Options) error {
controllerManager, err := controllerruntime.NewManager(controlPlaneRestConfig, controllerruntime.Options{ controllerManager, err := controllerruntime.NewManager(controlPlaneRestConfig, controllerruntime.Options{
Scheme: gclient.NewSchema(), Scheme: gclient.NewSchema(),
SyncPeriod: &opts.ResyncPeriod.Duration, Cache: cache.Options{SyncPeriod: &opts.ResyncPeriod.Duration, Namespaces: []string{executionSpace}},
Namespace: executionSpace,
LeaderElection: opts.LeaderElection.LeaderElect, LeaderElection: opts.LeaderElection.LeaderElect,
LeaderElectionID: fmt.Sprintf("karmada-agent-%s", opts.ClusterName), LeaderElectionID: fmt.Sprintf("karmada-agent-%s", opts.ClusterName),
LeaderElectionNamespace: opts.LeaderElection.ResourceNamespace, LeaderElectionNamespace: opts.LeaderElection.ResourceNamespace,

2
cmd/controller-manager/app/controllermanager.go
View File

@ -145,7 +145,7 @@ func Run(ctx context.Context, opts *options.Options) error {
controllerManager, err := controllerruntime.NewManager(controlPlaneRestConfig, controllerruntime.Options{ controllerManager, err := controllerruntime.NewManager(controlPlaneRestConfig, controllerruntime.Options{
Logger: klog.Background(), Logger: klog.Background(),
Scheme: gclient.NewSchema(), Scheme: gclient.NewSchema(),
SyncPeriod: &opts.ResyncPeriod.Duration, Cache: cache.Options{SyncPeriod: &opts.ResyncPeriod.Duration},
LeaderElection: opts.LeaderElection.LeaderElect, LeaderElection: opts.LeaderElection.LeaderElect,
LeaderElectionID: opts.LeaderElection.ResourceName, LeaderElectionID: opts.LeaderElection.ResourceName,
LeaderElectionNamespace: opts.LeaderElection.ResourceNamespace, LeaderElectionNamespace: opts.LeaderElection.ResourceNamespace,