From b2b50ea0340682ece3c96b31af2a001eddd17fa6 Mon Sep 17 00:00:00 2001 From: Maciej Zimnoch Date: Mon, 16 Nov 2020 16:47:14 +0100 Subject: [PATCH] controller: report sync errors --- pkg/controllers/cluster/sync.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controllers/cluster/sync.go b/pkg/controllers/cluster/sync.go index 26942fbbd65..d88aa7d748d 100644 --- a/pkg/controllers/cluster/sync.go +++ b/pkg/controllers/cluster/sync.go @@ -17,7 +17,7 @@ const ( // Messages to display when experiencing an error. MessageHeadlessServiceSyncFailed = "Failed to sync Headless Service for cluster" MessageMemberServicesSyncFailed = "Failed to sync MemberServices for cluster" - MessageUpdateStatusFailed = "Failed to update status for cluster" + MessageUpdateStatusFailed = "Failed to update status for cluster: %+v" MessageCleanupFailed = "Failed to clean up cluster resources" MessageClusterSyncFailed = "Failed to sync cluster, got error: %+v" ) @@ -61,7 +61,7 @@ func (cc *ClusterReconciler) sync(c *scyllav1alpha1.ScyllaCluster) error { // Update Status logger.Info(ctx, "Calculating cluster status...") if err := cc.updateStatus(ctx, c); err != nil { - cc.Recorder.Event(c, corev1.EventTypeWarning, naming.ErrSyncFailed, MessageUpdateStatusFailed) + cc.Recorder.Event(c, corev1.EventTypeWarning, naming.ErrSyncFailed, fmt.Sprintf(MessageUpdateStatusFailed, err)) return errors.Wrap(err, "failed to update status") } @@ -74,6 +74,7 @@ func (cc *ClusterReconciler) sync(c *scyllav1alpha1.ScyllaCluster) error { if err != nil { cc.Recorder.Event(c, corev1.EventTypeWarning, naming.ErrSyncFailed, fmt.Sprintf(MessageClusterSyncFailed, errors.Cause(err))) + return err } return nil