Skip to content

(chore) improve logs #1565

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
gianlucam76 merged 1 commit into from
Dec 20, 2025
Merged

(chore) improve logs #1565

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
10 changes: 5 additions & 5 deletions controllers/clusterprofile_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ type ClusterProfileReconciler struct {

func (r *ClusterProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")
// Fecth the ClusterProfile instance
clusterProfile := &configv1beta1.ClusterProfile{}
if err := r.Get(ctx, req.NamespacedName, clusterProfile); err != nil {
Expand Down Expand Up @@ -146,7 +146,7 @@ func (r *ClusterProfileReconciler) reconcileDelete(
profileScope *scope.ProfileScope) reconcile.Result {

logger := profileScope.Logger
logger.V(logs.LogInfo).Info("Reconciling ClusterProfile delete")
logger.V(logs.LogDebug).Info("Reconciling ClusterProfile delete")

if err := reconcileDeleteCommon(ctx, r.Client, profileScope,
configv1beta1.ClusterProfileFinalizer, logger); err != nil {
Expand All @@ -155,7 +155,7 @@ func (r *ClusterProfileReconciler) reconcileDelete(

r.cleanMaps(profileScope)

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")
return reconcile.Result{}
}

Expand All @@ -164,7 +164,7 @@ func (r *ClusterProfileReconciler) reconcileNormal(
profileScope *scope.ProfileScope) reconcile.Result {

logger := profileScope.Logger
logger.V(logs.LogInfo).Info("Reconciling ClusterProfile")
logger.V(logs.LogDebug).Info("Reconciling ClusterProfile")

if !controllerutil.ContainsFinalizer(profileScope.Profile, configv1beta1.ClusterProfileFinalizer) {
if err := addFinalizer(ctx, profileScope, configv1beta1.ClusterProfileFinalizer); err != nil {
Expand Down Expand Up @@ -204,7 +204,7 @@ func (r *ClusterProfileReconciler) reconcileNormal(
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
}

logger.V(logs.LogInfo).Info("Reconcile success")
logger.V(logs.LogDebug).Info("Reconcile success")
return reconcile.Result{}
}

Expand Down
2 changes: 1 addition & 1 deletion controllers/clusterpromotion_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type ClusterPromotionReconciler struct {

func (r *ClusterPromotionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")

// Fecth the ClusterPromotion instance
clusterPromotion := &configv1beta1.ClusterPromotion{}
Expand Down
10 changes: 5 additions & 5 deletions controllers/clusterset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type ClusterSetReconciler struct {

func (r *ClusterSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")
// Fecth the ClusterSet instance
clusterSet := &libsveltosv1beta1.ClusterSet{}
if err := r.Get(ctx, req.NamespacedName, clusterSet); err != nil {
Expand Down Expand Up @@ -121,19 +121,19 @@ func (r *ClusterSetReconciler) Reconcile(ctx context.Context, req ctrl.Request)

func (r *ClusterSetReconciler) reconcileDelete(setScope *scope.SetScope) {
logger := setScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Set delete")
logger.V(logs.LogDebug).Info("Reconciling Set delete")

r.cleanMaps(setScope)

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")
}

func (r *ClusterSetReconciler) reconcileNormal(
ctx context.Context,
setScope *scope.SetScope) reconcile.Result {

logger := setScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Set")
logger.V(logs.LogDebug).Info("Reconciling Set")

matchingCluster, err := getMatchingClusters(ctx, r.Client, "", setScope.GetSelector(),
setScope.GetSpec().ClusterRefs, logger)
Expand All @@ -150,7 +150,7 @@ func (r *ClusterSetReconciler) reconcileNormal(

r.updateMaps(setScope)

logger.V(logs.LogInfo).Info("Reconcile success")
logger.V(logs.LogDebug).Info("Reconcile success")
return reconcile.Result{}
}

Expand Down
10 changes: 5 additions & 5 deletions controllers/clustersummary_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ type ClusterSummaryReconciler struct {

func (r *ClusterSummaryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")

// Fecth the clusterSummary instance
clusterSummary := &configv1beta1.ClusterSummary{}
Expand Down Expand Up @@ -252,7 +252,7 @@ func (r *ClusterSummaryReconciler) reconcileDelete(
logger logr.Logger,
) (reconcile.Result, error) {

logger.V(logs.LogInfo).Info("Reconciling ClusterSummary delete")
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary delete")

r.updateDeletedInstancs(clusterSummaryScope)

Expand Down Expand Up @@ -329,15 +329,15 @@ func (r *ClusterSummaryReconciler) reconcileDelete(
manager := getManager()
manager.stopStaleWatchForTemplateResourceRef(ctx, clusterSummaryScope.ClusterSummary, true)

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")

return reconcile.Result{}, nil
}

func (r *ClusterSummaryReconciler) reconcileNormal(ctx context.Context,
clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) (reconcile.Result, error) {

logger.V(logs.LogInfo).Info("Reconciling ClusterSummary")
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary")

if !controllerutil.ContainsFinalizer(clusterSummaryScope.ClusterSummary, configv1beta1.ClusterSummaryFinalizer) {
if err := r.addFinalizer(ctx, clusterSummaryScope); err != nil {
Expand Down Expand Up @@ -427,7 +427,7 @@ func (r *ClusterSummaryReconciler) proceedDeployingClusterSummary(ctx context.Co
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
}

logger.V(logs.LogInfo).Info("Reconciling ClusterSummary success")
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary success")

if clusterSummaryScope.IsDryRunSync() {
r.resetFeatureStatusToProvisioning(clusterSummaryScope)
Expand Down
10 changes: 5 additions & 5 deletions controllers/profile_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ type ProfileReconciler struct {

func (r *ProfileReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")

// Fecth the Profile instance
profile := &configv1beta1.Profile{}
Expand Down Expand Up @@ -176,7 +176,7 @@ func (r *ProfileReconciler) reconcileDelete(
profileScope *scope.ProfileScope) reconcile.Result {

logger := profileScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Profile delete")
logger.V(logs.LogDebug).Info("Reconciling Profile delete")

if err := reconcileDeleteCommon(ctx, r.Client, profileScope,
configv1beta1.ProfileFinalizer, logger); err != nil {
Expand All @@ -185,7 +185,7 @@ func (r *ProfileReconciler) reconcileDelete(

r.cleanMaps(profileScope)

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")
return reconcile.Result{}
}

Expand All @@ -194,7 +194,7 @@ func (r *ProfileReconciler) reconcileNormal(
profileScope *scope.ProfileScope) reconcile.Result {

logger := profileScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Profile")
logger.V(logs.LogDebug).Info("Reconciling Profile")

if !controllerutil.ContainsFinalizer(profileScope.Profile, configv1beta1.ProfileFinalizer) {
if err := addFinalizer(ctx, profileScope, configv1beta1.ProfileFinalizer); err != nil {
Expand Down Expand Up @@ -234,7 +234,7 @@ func (r *ProfileReconciler) reconcileNormal(
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
}

logger.V(logs.LogInfo).Info("Reconcile success")
logger.V(logs.LogDebug).Info("Reconcile success")
return reconcile.Result{}
}

Expand Down
10 changes: 5 additions & 5 deletions controllers/resourcesummary_collection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ func collectAndProcessResourceSummaries(ctx context.Context, c client.Client, sh
clusterList, err := clusterproxy.GetListOfClustersForShardKey(ctx, c, "", getCAPIOnboardAnnotation(),
shardkey, logger)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get clusters: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get clusters")
continue
}

clustersWithDD, err := getListOfClusterWithDriftDetectionDeployed(ctx, c)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to collect clusters with drift detection: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to collect clusters with drift detection")
continue
}

Expand Down Expand Up @@ -146,7 +146,7 @@ func collectResourceSummariesFromCluster(ctx context.Context, c client.Client, c
var installed bool
installed, err = isResourceSummaryInstalled(ctx, clusterClient)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to verify if ResourceSummary is installed %v", err))
logger.V(logs.LogInfo).Error(err, "failed to verify if ResourceSummary is installed")
return err
}

Expand Down Expand Up @@ -318,7 +318,7 @@ func processResourceSummary(ctx context.Context, clusterClient client.Client,
}

if !clusterSummary.DeletionTimestamp.IsZero() {
logger.V(logs.LogInfo).Info("clusterSummary is marked for deletion. Nothing to do.")
logger.V(logs.LogDebug).Info("clusterSummary is marked for deletion. Nothing to do.")
return nil
}

Expand Down Expand Up @@ -354,7 +354,7 @@ func processResourceSummary(ctx context.Context, clusterClient client.Client,

err = getManagementClusterClient().Status().Update(ctx, clusterSummary)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to update ClusterSummary status: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to update ClusterSummary status")
return err
}
return nil
Expand Down
10 changes: 5 additions & 5 deletions controllers/set_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type SetReconciler struct {

func (r *SetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")

// Fecth the Set instance
set := &libsveltosv1beta1.Set{}
Expand Down Expand Up @@ -129,19 +129,19 @@ func (r *SetReconciler) reconcileDelete(
setScope *scope.SetScope) {

logger := setScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Set delete")
logger.V(logs.LogDebug).Info("Reconciling Set delete")

r.cleanMaps(setScope)

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")
}

func (r *SetReconciler) reconcileNormal(
ctx context.Context,
setScope *scope.SetScope) reconcile.Result {

logger := setScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Set")
logger.V(logs.LogDebug).Info("Reconciling Set")

// Limit the search of matching cluster to the Set namespace
matchingCluster, err := getMatchingClusters(ctx, r.Client, setScope.Set.GetNamespace(),
Expand All @@ -159,7 +159,7 @@ func (r *SetReconciler) reconcileNormal(

r.updateMaps(setScope)

logger.V(logs.LogInfo).Info("Reconcile success")
logger.V(logs.LogDebug).Info("Reconcile success")
return reconcile.Result{}
}

Expand Down