Skip to content
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

move logger to Reconciler struct #8

Merged
merged 2 commits into from
Dec 7, 2021
Merged

move logger to Reconciler struct #8

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
600bb9e
move logger to Reconciler struct
rohantmp Dec 6, 2021
8686f4c
fix: rename topolvmcluster->lvmcluster
rohantmp Dec 6, 2021
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
13 changes: 7 additions & 6 deletions controllers/lvmcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const (
type LVMClusterReconciler struct {
client.Client
Scheme *runtime.Scheme
Log logr.Logger
}

//+kubebuilder:rbac:groups=lvm.topolvm.io,resources=lvmclusters,verbs=get;list;watch;create;update;patch;delete
Expand All @@ -53,19 +54,19 @@ type LVMClusterReconciler struct {
// For more details, check Reconcile and its Result here:
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
func (r *LVMClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
logger := log.FromContext(ctx).WithName(ControllerName)
logger.Info("reconciling", "topolvmcluster", req)
result, err := r.reconcile(ctx, req, logger)
r.Log = log.FromContext(ctx).WithName(ControllerName)
r.Log.Info("reconciling", "topolvmcluster", req)
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be "lvmcluster"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

result, err := r.reconcile(ctx, req)
// TODO: update status with condition describing whether reconcile succeeded
if err != nil {
logger.Error(err, "reconcile error")
r.Log.Error(err, "reconcile error")
}

return result, err
}

// errors returned by this will be updated in the reconcileSucceeded condition of the LVMCluster
func (r *LVMClusterReconciler) reconcile(ctx context.Context, req ctrl.Request, logger logr.Logger) (ctrl.Result, error) {
func (r *LVMClusterReconciler) reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
result := ctrl.Result{}

// get lvmcluster
Expand Down Expand Up @@ -103,7 +104,7 @@ func (r *LVMClusterReconciler) reconcile(ctx context.Context, req ctrl.Request,
if err != nil {
failedStatusUpdates = append(failedStatusUpdates, unit.getName())
unitError := fmt.Errorf("failed updating status for: %s %w", unit.getName(), err)
logger.Error(unitError, "")
r.Log.Error(unitError, "")
}
}
// return simple message that will fit in status reconcileSucceeded condition, don't put all the errors there
Expand Down