Skip to content

Commit e53e767

Browse files
gianlucam76gianlucam76
authored
Merge pull request #1565 from gianlucam76/logs
(chore) improve logs
2 parents ac01ed9 + 21798cb commit e53e767

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎controllers/clusterprofile_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type ClusterProfileReconciler struct {
9292

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

148148
logger := profileScope.Logger
149-
logger.V(logs.LogInfo).Info("Reconciling ClusterProfile delete")
149+
logger.V(logs.LogDebug).Info("Reconciling ClusterProfile delete")
150150

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

156156
r.cleanMaps(profileScope)
157157

158-
logger.V(logs.LogInfo).Info("Reconcile delete success")
158+
logger.V(logs.LogDebug).Info("Reconcile delete success")
159159
return reconcile.Result{}
160160
}
161161

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

166166
logger := profileScope.Logger
167-
logger.V(logs.LogInfo).Info("Reconciling ClusterProfile")
167+
logger.V(logs.LogDebug).Info("Reconciling ClusterProfile")
168168

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

207-
logger.V(logs.LogInfo).Info("Reconcile success")
207+
logger.V(logs.LogDebug).Info("Reconcile success")
208208
return reconcile.Result{}
209209
}
210210

‎controllers/clusterpromotion_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ type ClusterPromotionReconciler struct {
7979

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

8484
// Fecth the ClusterPromotion instance
8585
clusterPromotion := &configv1beta1.ClusterPromotion{}

‎controllers/clusterset_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type ClusterSetReconciler struct {
8080

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

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

126126
r.cleanMaps(setScope)
127127

128-
logger.V(logs.LogInfo).Info("Reconcile delete success")
128+
logger.V(logs.LogDebug).Info("Reconcile delete success")
129129
}
130130

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

135135
logger := setScope.Logger
136-
logger.V(logs.LogInfo).Info("Reconciling Set")
136+
logger.V(logs.LogDebug).Info("Reconciling Set")
137137

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

151151
r.updateMaps(setScope)
152152

153-
logger.V(logs.LogInfo).Info("Reconcile success")
153+
logger.V(logs.LogDebug).Info("Reconcile success")
154154
return reconcile.Result{}
155155
}
156156

‎controllers/clustersummary_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ type ClusterSummaryReconciler struct {
147147

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

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

255-
logger.V(logs.LogInfo).Info("Reconciling ClusterSummary delete")
255+
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary delete")
256256

257257
r.updateDeletedInstancs(clusterSummaryScope)
258258

@@ -329,15 +329,15 @@ func (r *ClusterSummaryReconciler) reconcileDelete(
329329
manager := getManager()
330330
manager.stopStaleWatchForTemplateResourceRef(ctx, clusterSummaryScope.ClusterSummary, true)
331331

332-
logger.V(logs.LogInfo).Info("Reconcile delete success")
332+
logger.V(logs.LogDebug).Info("Reconcile delete success")
333333

334334
return reconcile.Result{}, nil
335335
}
336336

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

340-
logger.V(logs.LogInfo).Info("Reconciling ClusterSummary")
340+
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary")
341341

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

430-
logger.V(logs.LogInfo).Info("Reconciling ClusterSummary success")
430+
logger.V(logs.LogDebug).Info("Reconciling ClusterSummary success")
431431

432432
if clusterSummaryScope.IsDryRunSync() {
433433
r.resetFeatureStatusToProvisioning(clusterSummaryScope)

‎controllers/profile_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ type ProfileReconciler struct {
118118

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

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

178178
logger := profileScope.Logger
179-
logger.V(logs.LogInfo).Info("Reconciling Profile delete")
179+
logger.V(logs.LogDebug).Info("Reconciling Profile delete")
180180

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

186186
r.cleanMaps(profileScope)
187187

188-
logger.V(logs.LogInfo).Info("Reconcile delete success")
188+
logger.V(logs.LogDebug).Info("Reconcile delete success")
189189
return reconcile.Result{}
190190
}
191191

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

196196
logger := profileScope.Logger
197-
logger.V(logs.LogInfo).Info("Reconciling Profile")
197+
logger.V(logs.LogDebug).Info("Reconciling Profile")
198198

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

237-
logger.V(logs.LogInfo).Info("Reconcile success")
237+
logger.V(logs.LogDebug).Info("Reconcile success")
238238
return reconcile.Result{}
239239
}
240240

‎controllers/resourcesummary_collection.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ func collectAndProcessResourceSummaries(ctx context.Context, c client.Client, sh
5151
clusterList, err := clusterproxy.GetListOfClustersForShardKey(ctx, c, "", getCAPIOnboardAnnotation(),
5252
shardkey, logger)
5353
if err != nil {
54-
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get clusters: %v", err))
54+
logger.V(logs.LogInfo).Error(err, "failed to get clusters")
5555
continue
5656
}
5757

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

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

@@ -318,7 +318,7 @@ func processResourceSummary(ctx context.Context, clusterClient client.Client,
318318
}
319319

320320
if !clusterSummary.DeletionTimestamp.IsZero() {
321-
logger.V(logs.LogInfo).Info("clusterSummary is marked for deletion. Nothing to do.")
321+
logger.V(logs.LogDebug).Info("clusterSummary is marked for deletion. Nothing to do.")
322322
return nil
323323
}
324324

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

355355
err = getManagementClusterClient().Status().Update(ctx, clusterSummary)
356356
if err != nil {
357-
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to update ClusterSummary status: %v", err))
357+
logger.V(logs.LogInfo).Error(err, "failed to update ClusterSummary status")
358358
return err
359359
}
360360
return nil

‎controllers/set_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ type SetReconciler struct {
8181

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

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

131131
logger := setScope.Logger
132-
logger.V(logs.LogInfo).Info("Reconciling Set delete")
132+
logger.V(logs.LogDebug).Info("Reconciling Set delete")
133133

134134
r.cleanMaps(setScope)
135135

136-
logger.V(logs.LogInfo).Info("Reconcile delete success")
136+
logger.V(logs.LogDebug).Info("Reconcile delete success")
137137
}
138138

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

143143
logger := setScope.Logger
144-
logger.V(logs.LogInfo).Info("Reconciling Set")
144+
logger.V(logs.LogDebug).Info("Reconciling Set")
145145

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

160160
r.updateMaps(setScope)
161161

162-
logger.V(logs.LogInfo).Info("Reconcile success")
162+
logger.V(logs.LogDebug).Info("Reconcile success")
163163
return reconcile.Result{}
164164
}
165165

0 commit comments

Comments
 (0)