Skip to content

K8SPSMDB-1075 use controller runtime builder #1692

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

Merged
nmarukovich merged 19 commits into from
Nov 26, 2024
Merged

K8SPSMDB-1075 use controller runtime builder #1692

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
16146b9
K8SPSMDB-1075 use controller runtime builder
nmarukovich Oct 30, 2024
7232b2e
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Oct 30, 2024
48cab0b
fix
nmarukovich Oct 30, 2024
86e1b54
Apply suggestions from code review
nmarukovich Oct 30, 2024
42fa1a3
delete unused code
nmarukovich Oct 31, 2024
81487cc
Merge branch 'K8SPSMDB-1075_use_controller_runtime_builder' of github…
nmarukovich Oct 31, 2024
5b1a14e
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 7, 2024
b5273d0
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 11, 2024
944bce6
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 14, 2024
25a6a8b
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 18, 2024
31692b1
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 20, 2024
af6bb73
fix PR comments
nmarukovich Nov 22, 2024
e4a0c91
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 22, 2024
5246891
fix controller
nmarukovich Nov 23, 2024
265f439
Merge branch 'K8SPSMDB-1075_use_controller_runtime_builder' of github…
nmarukovich Nov 23, 2024
58ef4f7
Update pkg/controller/perconaservermongodbbackup/perconaservermongodb…
nmarukovich Nov 23, 2024
1273100
Apply suggestions from code review
nmarukovich Nov 23, 2024
a1c4006
fix imports
nmarukovich Nov 23, 2024
45ff87f
Merge branch 'main' into K8SPSMDB-1075_use_controller_runtime_builder
nmarukovich Nov 26, 2024
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
25 changes: 7 additions & 18 deletions pkg/controller/perconaservermongodb/psmdb_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/percona/percona-server-mongodb-operator/clientcmd"
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
Expand Down Expand Up @@ -134,21 +132,14 @@ func getOperatorPodImage(ctx context.Context) (string, error) {

// add adds a new Controller to mgr with r as the reconcile.Reconciler
func add(mgr manager.Manager, r reconcile.Reconciler) error {
// Create a new controller
c, err := controller.New("psmdb-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}

// Watch for changes to primary resource PerconaServerMongoDB
err = c.Watch(source.Kind(mgr.GetCache(), &api.PerconaServerMongoDB{}, &handler.TypedEnqueueRequestForObject[*api.PerconaServerMongoDB]{}))
if err != nil {
return err
}

return nil
return builder.ControllerManagedBy(mgr).
For(&api.PerconaServerMongoDB{}).
Named("psmdb-controller").
Complete(r)
}

var _ reconcile.Reconciler = &ReconcilePerconaServerMongoDB{}

type CronRegistry struct {
crons *cron.Cron
jobs map[string]Schedule
Expand All @@ -172,8 +163,6 @@ func NewCronRegistry() CronRegistry {
return c
}

var _ reconcile.Reconciler = &ReconcilePerconaServerMongoDB{}

// ReconcilePerconaServerMongoDB reconciles a PerconaServerMongoDB object
type ReconcilePerconaServerMongoDB struct {
// This client, initialized using mgr.Client() above, is a split client
Expand Down
48 changes: 14 additions & 34 deletions pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,18 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

pbmBackup "github.com/percona/percona-backup-mongodb/pbm/backup"
pbmErrors "github.com/percona/percona-backup-mongodb/pbm/errors"
"github.com/percona/percona-backup-mongodb/pbm/storage"
"github.com/percona/percona-backup-mongodb/pbm/storage/azure"
"github.com/percona/percona-backup-mongodb/pbm/storage/s3"

"github.com/percona/percona-server-mongodb-operator/clientcmd"
Copy link
Contributor

@github-actions github-actions bot Nov 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[goimports-reviser] reported by reviewdog 🐶

Suggested change
"github.com/percona/percona-server-mongodb-operator/clientcmd"
"github.com/percona/percona-server-mongodb-operator/clientcmd"

psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
"github.com/percona/percona-server-mongodb-operator/pkg/naming"
Expand Down Expand Up @@ -67,29 +65,20 @@ func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) {
}

// add adds a new Controller to mgr with r as the reconcile.Reconciler
func add(mgr manager.Manager, r reconcile.Reconciler) error {
// Create a new controller
c, err := controller.New("psmdbbackup-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}

// Watch for changes to primary resource PerconaServerMongoDBBackup
err = c.Watch(source.Kind(mgr.GetCache(), &psmdbv1.PerconaServerMongoDBBackup{}, &handler.TypedEnqueueRequestForObject[*psmdbv1.PerconaServerMongoDBBackup]{}))
if err != nil {
return err
}

// TODO(user): Modify this to be the types you create that are owned by the primary resource
// Watch for changes to secondary resource Pods and requeue the owner PerconaServerMongoDBBackup
err = c.Watch(source.Kind(mgr.GetCache(), &corev1.Pod{}, handler.TypedEnqueueRequestForOwner[*corev1.Pod](
mgr.GetScheme(), mgr.GetRESTMapper(), &psmdbv1.PerconaServerMongoDBBackup{}, handler.OnlyControllerOwner(),
)))
if err != nil {
return err
}

return nil
func add(mgr manager.Manager, r reconcile.Reconciler) error {
return builder.ControllerManagedBy(mgr).
Named("psmdbbackup-controller").
For(&psmdbv1.PerconaServerMongoDBBackup{}).
Watches(
&corev1.Pod{},
handler.EnqueueRequestForOwner(
mgr.GetScheme(), mgr.GetRESTMapper(),
&psmdbv1.PerconaServerMongoDBBackup{},
handler.OnlyControllerOwner(),
),
).
Complete(r)
}

var _ reconcile.Reconciler = &ReconcilePerconaServerMongoDBBackup{}
Expand Down Expand Up @@ -177,15 +166,6 @@ func (r *ReconcilePerconaServerMongoDBBackup) Reconcile(ctx context.Context, req
if err != nil {
return rr, errors.Wrapf(err, "set defaults for %s/%s", cluster.Namespace, cluster.Name)
}
// TODO: Remove after 1.15
if cluster.CompareVersion("1.12.0") >= 0 && cr.Spec.ClusterName == "" {
cr.Spec.ClusterName = cr.Spec.PSMDBCluster
cr.Spec.PSMDBCluster = ""
err = r.client.Update(ctx, cr)
if err != nil {
return rr, errors.Wrap(err, "failed to update clusterName")
}
}
Comment on lines -180 to -188
Copy link
Contributor

@egegunes egegunes Nov 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please sync with @fiowro for release notes, we need to mention this field is deprecated

Copy link
Contributor Author

@nmarukovich nmarukovich Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, sure

Copy link
Contributor Author

@nmarukovich nmarukovich Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fiowro we need to add to docs, that this field was deleted.

}

bcp, err := r.newBackup(ctx, cluster)
Expand Down
39 changes: 15 additions & 24 deletions pkg/controller/perconaservermongodbrestore/perconaservermongodbrestore_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/percona/percona-backup-mongodb/pbm/defs"

Expand Down Expand Up @@ -56,29 +55,21 @@ func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) {
}, nil
}

// add adds a new Controller to mgr with r as the reconcile.Reconciler
func add(mgr manager.Manager, r reconcile.Reconciler) error {
// Create a new controller
c, err := controller.New("psmdbrestore-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}
//add adds a new Controller to mgr with r as the reconcile.Reconciler

// Watch for changes to primary resource PerconaServerMongoDBRestore
err = c.Watch(source.Kind(mgr.GetCache(), &psmdbv1.PerconaServerMongoDBRestore{}, &handler.TypedEnqueueRequestForObject[*psmdbv1.PerconaServerMongoDBRestore]{}))
if err != nil {
return err
}

// Watch for changes to secondary resource Pods and requeue the owner PerconaServerMongoDBRestore
err = c.Watch(source.Kind(mgr.GetCache(), &corev1.Pod{}, handler.TypedEnqueueRequestForOwner[*corev1.Pod](
mgr.GetScheme(), mgr.GetRESTMapper(), &psmdbv1.PerconaServerMongoDBRestore{}, handler.OnlyControllerOwner(),
)))
if err != nil {
return err
}

return nil
func add(mgr manager.Manager, r reconcile.Reconciler) error {
return builder.ControllerManagedBy(mgr).
Named("psmdbrestore-controller").
For(&psmdbv1.PerconaServerMongoDBRestore{}).
Watches(
&corev1.Pod{},
handler.EnqueueRequestForOwner(
mgr.GetScheme(), mgr.GetRESTMapper(),
&psmdbv1.PerconaServerMongoDBRestore{},
handler.OnlyControllerOwner(),
),
).
Complete(r)
}

var _ reconcile.Reconciler = &ReconcilePerconaServerMongoDBRestore{}
Expand Down