Skip to content

Commit f28a811

Browse files
committed
MHC: Drop Reconciling log, CAPD: log image name during preload
Signed-off-by: Stefan Büringer [email protected]
1 parent bb0ac56 commit f28a811

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

internal/controllers/machinehealthcheck/machinehealthcheck_controller.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
117117

118118
func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
119119
log := ctrl.LoggerFrom(ctx)
120-
log.Info("Reconciling")
121120

122121
// Fetch the MachineHealthCheck instance
123122
m := &clusterv1.MachineHealthCheck{}

test/infrastructure/docker/internal/docker/machine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,19 +297,19 @@ func (m *Machine) PreloadLoadImages(ctx context.Context, images []string) error
297297

298298
err = containerRuntime.SaveContainerImage(ctx, image, imageTarPath)
299299
if err != nil {
300-
return errors.Wrap(err, "failed to save image")
300+
return errors.Wrapf(err, "failed to save image %q to %q", image, imageTarPath)
301301
}
302302

303303
f, err := os.Open(imageTarPath)
304304
if err != nil {
305-
return errors.Wrap(err, "failed to open image")
305+
return errors.Wrapf(err, "failed to open image %q from %q", image, imageTarPath)
306306
}
307307
defer f.Close() //nolint:gocritic // No resource leak.
308308

309309
ps := m.container.Commander.Command("ctr", "--namespace=k8s.io", "images", "import", "-")
310310
ps.SetStdin(f)
311311
if err := ps.Run(ctx); err != nil {
312-
return errors.Wrap(err, "failed to load image")
312+
return errors.Wrapf(err, "failed to load image %q", image)
313313
}
314314
}
315315
return nil

0 commit comments

Comments
 (0)