Skip to content

fix(operations): add durable switchover dispatch claim #10651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
weicao wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(operations): add durable switchover dispatch claim #10651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,10 @@ func main() {
}

if err = (&opscontrollers.OpsRequestReconciler{
Client: client,
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("ops-request-controller"),
Client: client,
APIReader: mgr.GetAPIReader(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("ops-request-controller"),
}).SetupWithManager(mgr, multiClusterMgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "OpsRequest")
os.Exit(1)
Expand Down
7 changes: 4 additions & 3 deletions controllers/operations/opsrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ import (
// OpsRequestReconciler reconciles a OpsRequest object
type OpsRequestReconciler struct {
client.Client
Scheme *runtime.Scheme
Recorder record.EventRecorder
APIReader client.Reader
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

// +kubebuilder:rbac:groups=operations.kubeblocks.io,resources=opsrequests,verbs=get;list;watch;create;update;patch;delete
Expand All @@ -80,7 +81,7 @@ func (r *OpsRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}
reqCtx.Log.Info("reconcile", "opsRequest", req.NamespacedName)
opsCtrlHandler := &opsControllerHandler{}
return opsCtrlHandler.Handle(reqCtx, &operations.OpsResource{Recorder: r.Recorder},
return opsCtrlHandler.Handle(reqCtx, &operations.OpsResource{Recorder: r.Recorder, APIReader: r.APIReader},
r.fetchOpsRequest,
r.fetchCluster,
r.handleDeletion,
Expand Down
7 changes: 4 additions & 3 deletions controllers/operations/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,10 @@ var _ = BeforeSuite(func() {
Expect(err).ToNot(HaveOccurred())

err = (&OpsRequestReconciler{
Client: k8sManager.GetClient(),
Scheme: k8sManager.GetScheme(),
Recorder: k8sManager.GetEventRecorderFor("ops-request-controller"),
Client: k8sManager.GetClient(),
APIReader: k8sManager.GetAPIReader(),
Scheme: k8sManager.GetScheme(),
Recorder: k8sManager.GetEventRecorderFor("ops-request-controller"),
}).SetupWithManager(k8sManager, nil)
Expect(err).ToNot(HaveOccurred())

Expand Down
Loading
Loading